2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Use
	top level shared bsp_get_work_area() implementation.

5 files changed, 18 insertions, 74 deletions

diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 9b847d689b..714005d349 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-18	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Use
+	top level shared bsp_get_work_area() implementation.
+
+2008-09-18	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* include/bsp.h: Remove unnecessary variables and EXTERN magic.
 
 2008-09-18	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index ebc0c31f0a..44cb822768 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -39,7 +39,8 @@ dist_project_lib_DATA += startup/linkcmds
 
 include_HEADERS += ../../i386/shared/comm/uart.h
 startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
-    ../../shared/bsppredriverhook.c \
+    ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
+    ../../shared/bspgetworkarea.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../i386/shared/irq/idt.c \
     ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.ac b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
index 61687ffbcf..d33271ae6e 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.ac
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
@@ -40,6 +40,8 @@ RTEMS_BSPOPTS_SET([UARTDEBUG],[*],[])
 RTEMS_BSPOPTS_HELP([UARTDEBUG],
 [Enables some debugging in the BSP's uart.])
 
+RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
index b003c76877..8db8f8ef37 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
@@ -4,7 +4,7 @@
  *  The generic CPU dependent initialization has been performed
  *  before this routine is invoked.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -20,64 +20,17 @@
  *  $Id$
  */
 
-void bsp_clean_up(void);
-
 #include <bsp.h>
 
-/*
- *  Tells us where to put the workspace in case remote debugger is present.
- */
-
-extern uint32_t          rdb_start;
-
-/*
- *  Use the shared implementations of the following routines
- */
-
-void bsp_libc_init( void *, uint32_t, int );
-
-/*
- *  Function:   bsp_pretasking_hook
- *  Created:    95/03/10
- *
- *  Description:
- *      BSP pretasking hook.  Called just before drivers are initialized.
- *      Used to setup libc and install any BSP extensions.
- *
- *  NOTES:
- *      Must not use libc (to do io) from here, since drivers are
- *      not yet initialized.
- *
- */
-
-void bsp_pretasking_hook(void)
-{
-    extern int heap_bottom;
-    uint32_t         heap_start;
-    uint32_t         heap_size;
-
-    heap_start = (uint32_t) &heap_bottom;
-    if (heap_start & (CPU_ALIGNMENT-1))
-      heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
-
-    heap_size = Configuration.work_space_start -(void *) heap_start ;
-    heap_size &= 0xfffffff0;  /* keep it as a multiple of 16 bytes */
-
-    bsp_libc_init((void *) heap_start, heap_size, 0);
-}
+extern void rtems_irq_mngt_init(void);
 
 /*
  *  bsp_start
  *
  *  This routine does the bulk of the system initialization.
  */
-
 void bsp_start( void )
 {
-  extern void rtems_irq_mngt_init(void);
-
-  Configuration.work_space_start = (void *)
-     RAM_END - rtems_configuration_get_work_space_size();
 
   /*
    * Init rtems_interrupt_management
@@ -88,27 +41,4 @@ void bsp_start( void )
    * Init rtems exceptions management
    */
   rtems_exception_init_mngt();
-
-  /*
-   *  The following information is very useful when debugging.
-   */
-
-#ifdef BSP_DEBUG
-  printk( "RAM_START = 0x%x\nRAM_END = 0x%x\n", RAM_START, RAM_END );
-  printk( "work_space_start = 0x%x\n",
-     Configuration.work_space_start );
-  printk( "work_space_size = 0x%x\n",
-     rtems_configuration_get_work_space_size() );
-  printk( "microseconds_per_tick = 0x%x\n",
-     rtems_configuration_get_microseconds_per_tick() );
-  printk( "ticks_per_timeslice = 0x%x\n",
-     rtems_configuration_get_ticks_per_timeslice() );
-
-  /*  printk( "_heap_size = 0x%x\n", _heap_size );
-      printk( "_stack_size = 0x%x\n", _stack_size ); */
-#endif
-}
-
-void bsp_clean_up(void) {
-  printk("bsp_cleanup called\n");
 }
diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/linkcmds b/c/src/lib/libbsp/i386/ts_386ex/startup/linkcmds
index fd7521bc86..093be01330 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/linkcmds
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/linkcmds
@@ -19,7 +19,11 @@
  * 0x0100000 -> 0x0200000 : bss section, stack space, heap storage
  */
 
-	ENTRY(_init_i386ex) ;
+RamBase = DEFINED(RamBase) ? RamBase : 0x00100000;
+RamSize = DEFINED(RamSize) ? RamSize : 512K;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
+
+ENTRY(_init_i386ex);
 
 SECTIONS
 {
@@ -169,6 +173,8 @@ SECTIONS
         stack_size  = 0x8000 ;
 	stack_origin = _ebss + stack_size ;
 	heap_bottom  = stack_origin + 4 ;  
+        . = ALIGN(0x10);
+        WorkAreaBase = .;