All m68k BSPs now build with new ELF style linkcmds.

3 files changed, 14 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/m68k/idp/startup/Makefile.in b/c/src/lib/libbsp/m68k/idp/startup/Makefile.in
index f4ce788577..a4ed3ac474 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/idp/startup/Makefile.in
@@ -16,8 +16,8 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 PGM = ${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
-C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
-    gnatinstallhandler
+C_PIECES = bspclean bsplibc bsppost bspstart bootcard m68kpretaskinghook \
+    main sbrk setvec gnatinstallhandler
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
index d67cb92225..877fd1d053 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
@@ -46,39 +46,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 int _end;
-    rtems_unsigned32        heap_start;
- 
-    heap_start = (rtems_unsigned32) &_end;
-    if (heap_start & (CPU_ALIGNMENT-1))
-        heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
- 
-	/* Create 64 KByte memory region for RTEMS executive */
-    bsp_libc_init((void *) heap_start, 64 * 1024, 0);
- 
-#ifdef RTEMS_DEBUG
-    rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
-#endif
-}
- 
-/*
  *  bsp_start
  *
  *  This routine does the bulk of the system initialization.
@@ -88,6 +58,7 @@ void bsp_start( void )
 {
   m68k_isr_entry *monitors_vector_table;
   int             index;
+  extern void    *_WorkspaceBase;
 
   duart_base = (unsigned char *)DUART_ADDR;
 
@@ -126,8 +97,7 @@ void bsp_start( void )
   Cpu_table.interrupt_vector_table = (m68k_isr_entry *) &M68Kvec;
   Cpu_table.interrupt_stack_size = 4096;
 
-  BSP_Configuration.work_space_start = (void *)
-     (RAM_END - BSP_Configuration.work_space_size);
+  BSP_Configuration.work_space_start = (void *) &_WorkspaceBase;
  
 /*  led_putnum('e'); * for debugging purposes only */
 
diff --git a/c/src/lib/libbsp/m68k/idp/startup/linkcmds b/c/src/lib/libbsp/m68k/idp/startup/linkcmds
index d676f6589d..9eadcedcda 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/idp/startup/linkcmds
@@ -20,8 +20,10 @@ MEMORY
 /*
  * Declare some sizes.
  */
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
-StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
+_RamBase = 0x0;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 2M;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
+_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
 SECTIONS
 {
@@ -111,23 +113,17 @@ SECTIONS
                 PROVIDE (_copy_end = .);
         } >ram
         .bss : {
-                PROVIDE (_bss_start = .);
-                PROVIDE (_clear_start = .);
+                _clear_start = .;
                 *(.bss)
                 *(COMMON)
                 . = ALIGN (16);
                 PROVIDE (end = .);
 
-                . += StackSize;
-                PROVIDE (_stack_init = .);
-
+                . += _StackSize;
                 . = ALIGN (16);
-                PROVIDE (_HeapStart = .);
-                . += HeapSize;
-                PROVIDE (_HeapEnd = .);
-
-                PROVIDE (_clear_end = .);
+                _stack_init = .;
+                _clear_end = .;
 
-                PROVIDE (_WorkspaceBase = .);
+                _WorkspaceBase = .;
         } >ram
 }