New patch from Eric Norum plus some minor mods by Joel.

1 files changed, 2 insertions, 29 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
index aa3f48bf01..9279cf6cd1 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
@@ -28,6 +28,7 @@
 
 extern rtems_configuration_table Configuration;
 rtems_configuration_table  BSP_Configuration;
+unsigned long _RamSize;
 
 rtems_cpu_table Cpu_table;
 
@@ -39,34 +40,9 @@ char *rtems_progname;
  
 void bsp_postdriver_hook(void);
 void bsp_libc_init( void *, unsigned32, int );
+void bsp_pretasking_hook(void);               /* m68k version */
 
 /*
- *  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 void *_HeapStart;
-    extern rtems_unsigned32 _HeapSize;
-
-    bsp_libc_init(&_HeapStart, _HeapSize, 0);
- 
-#ifdef RTEMS_DEBUG
-    rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
-#endif
-}
- 
-/*
  *  bsp_start
  *
  *  This routine does the bulk of the system initialization.
@@ -83,9 +59,6 @@ void bsp_start( void )
    *  typically done by stock BSPs) by subtracting the required amount
    *  of work space from the last physical address on the CPU board.
    */
-#if 0
-  Cpu_table.interrupt_vector_table = (mc68000_isr *) 0/*&M68Kvec*/;
-#endif
 
   /*
    *  Need to "allocate" the memory for the RTEMS Workspace and