bsps/m68k: Add and use linkcmds.base

8 files changed, 67 insertions, 514 deletions

diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 0cd50c21d4..6a7cfd9faa 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -4,8 +4,6 @@ include $(top_srcdir)/../../../../automake/compile.am
 
 include_bspdir = $(includedir)/bsp
 
-dist_project_lib_DATA = bsp_specs
-
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
 
@@ -18,12 +16,14 @@ include_HEADERS += ../../shared/include/coverhd.h
 
 noinst_LIBRARIES = libbspstart.a
 libbspstart_a_SOURCES = start/start.S
-project_lib_DATA = start.$(OBJEXT)
 
+dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
+dist_project_lib_DATA += startup/linkcmds.COBRA5475
+dist_project_lib_DATA += startup/linkcmds.m5484FireEngine
+
+project_lib_DATA = start.$(OBJEXT)
 project_lib_DATA += startup/linkcmds
-EXTRA_DIST = startup/linkcmds.m5484FireEngine.flash
-EXTRA_DIST += startup/linkcmds.COBRA5475
-EXTRA_DIST += startup/linkcmds.m5484FireEngine
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
index 0379d69ef1..9f16d9d54f 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
@@ -76,8 +76,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at
 /* define which port the console should use - all other ports are then defined as general purpose */
 #define CONSOLE_PORT        0
 
-#define RAM_END 0x4000000 /* 64 MB */
-
 /* functions */
 
 uint32_t get_CPU_clock_speed(void);
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
index d6a779e080..8c86e37d70 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
@@ -33,10 +33,6 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
 $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
@@ -57,6 +53,22 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
+PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
+
+$(PROJECT_LIB)/linkcmds.m5484FireEngine.flash: startup/linkcmds.m5484FireEngine.flash $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
+
+$(PROJECT_LIB)/linkcmds.COBRA5475: startup/linkcmds.COBRA5475 $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.COBRA5475
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.COBRA5475
+
+$(PROJECT_LIB)/linkcmds.m5484FireEngine: startup/linkcmds.m5484FireEngine $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine
+
 $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/start/start.S b/c/src/lib/libbsp/m68k/genmcf548x/start/start.S
index bbfbef9615..1b6f1dad76 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/start/start.S
+++ b/c/src/lib/libbsp/m68k/genmcf548x/start/start.S
@@ -47,6 +47,7 @@
 | Includes                                                        |
 \*===============================================================*/
 #include <rtems/asm.h>
+#include <bsp/linker-symbols.h>
 
 /*===============================================================*\
 | External references                                             |
@@ -57,7 +58,6 @@
 .extern _CoreSramSize1
 .extern mcf548x_init
 .extern boot_card
-.extern _SpInit
 
 /*===============================================================*\
 | Global symbols                                                  |
@@ -75,7 +75,7 @@
 .section ".vectors","ax"  	     /* begin of vectors section */
 PUBLIC (InterruptVectorTable)
 SYM(InterruptVectorTable):
-INITSP:		.long	_SpInit		        /* Initial SP		  */
+INITSP:		.long	bsp_initstack_end	/* Initial SP		  */
 INITPC:		.long	start			/* Initial PC		  */
 vector002:	.long	asm_default_interrupt	/* Access Error		  */
 vector003:	.long	asm_default_interrupt	/* Address Error	  */
@@ -335,6 +335,7 @@ vector255:	.long	asm_default_interrupt
 /*===============================================================*\
 | Start of code                                                   |
 \*===============================================================*/
+.text
 PUBLIC (start)
 SYM(start):
     move.w	#0x3700,sr              /* disable interrupts */
@@ -410,7 +411,7 @@ SYM(start_init):
 
     jsr	    mcf548x_init		/* Initialize mcf548x peripherals */
 
-    move.l  #_SpInit,sp		        /* relocate sp */
+    move.l  #bsp_initstack_end,sp	/* relocate sp */
 
     clrl    d0          		/* clear d0 */
     movel   d0,a7@-                     /* command line == 0 */
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c b/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c
index 7f2646d7d3..3a9d002cf3 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c
@@ -43,9 +43,12 @@
 |                                                                 |
 \*===============================================================*/
 
-#include <rtems.h>
 #include <bsp.h>
 
+#include <string.h>
+
+#include <bsp/linker-symbols.h>
+
 #if defined(HAS_LOW_LEVEL_INIT)
 #define SYSTEM_PERIOD			10  	/* system bus period in ns */
 
@@ -66,8 +69,6 @@ extern uint8_t _BssEnd[];
 extern uint8_t _BootFlashBase[];
 extern uint8_t _CodeFlashBase[];
 extern uint8_t RamBase[];
-extern uint32_t InterruptVectorTable[];
-extern uint32_t _VectorRam[];
 
 void gpio_init(void);
 void fbcs_init(void);
@@ -77,9 +78,6 @@ void mcf548x_init(void);
 
 void mcf548x_init(void)
     {
-    uint32_t n;
-    uint8_t *dp, *sp;
-
 #if defined(HAS_LOW_LEVEL_INIT)
     /* set XLB arbiter timeouts */
     MCF548X_XLB_ADRTO = 0x00000100;
@@ -93,36 +91,23 @@ void mcf548x_init(void)
     sdramc_init();
 #endif /* defined(HAS_LOW_LEVEL_INIT) */
 
-    /* Copy the vector table to RAM */
-    if (_VectorRam != InterruptVectorTable)
-    {
-	for( n = 0; n < 256; n++)
-	  {
-      _VectorRam[n] = InterruptVectorTable[n];
-	  }
+    /* Copy the vector table to RAM if necessary */
+    if (bsp_vector0_size == bsp_vector1_size) {
+      memcpy(bsp_vector1_begin, bsp_vector0_begin, (size_t) bsp_vector1_size);
+      m68k_set_vbr((uint32_t)bsp_vector1_begin);
     }
 
-    m68k_set_vbr((uint32_t)_VectorRam);
-
     /* Move initialized data from ROM to RAM. */
-    if (_DataRom != _DataRam)
-    {
-		n = _DataEnd - _DataRam;
-        sp = (uint8_t *)_DataRom;
-        dp = (uint8_t *)_DataRam;
-		while(n--)
-           *dp++ = *sp++;
-     }
-
-    /* Zero uninitialized data */
-    if (_BssStart != _BssEnd)
-    {
-		n = _BssEnd - _BssStart;
-        sp = (uint8_t *)_BssStart;
-        while (n--)
-            *sp++ = 0;
+    if (bsp_section_data_begin != bsp_section_data_load_begin) {
+      memcpy(
+        bsp_section_data_begin,
+        bsp_section_data_load_begin,
+        (size_t) bsp_section_data_size
+      );
     }
 
+    /* Zero uninitialized data */
+    memset(bsp_section_bss_begin, 0, (size_t) bsp_section_bss_size);
 }
 /********************************************************************/
 #if defined(HAS_LOW_LEVEL_INIT)
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475 b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475
index 468c41abb4..3460cbe967 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475
@@ -62,169 +62,21 @@ _CoreSramSize1  = DEFINED(_CoreSramSize1)  ? _CoreSramSize1 : (4 * 1024);
 _BootFlashBase  = DEFINED(_BootFlashBase)  ? _BootFlashBase : 0xFC000000;
 _BootFlashSize  = DEFINED(_BootFlashSize)  ? _BootFlashSize : (32 * 1024*1024);
 
-_VectorRam      = DEFINED(_VectorRam)      ? _VectorRam : _SdramBase;
-_DataRam        = DEFINED(_DataRam)        ? _DataRam   : _data_dest_start;
-_DataRom        = DEFINED(_DataRom)        ? _DataRom   : _data_src_start;
-_DataEnd        = DEFINED(_DataEnd)        ? _DataEnd   : _data_dest_end;
-_BssStart       = DEFINED(_BssStart)       ? _BssStart  : _clear_start;
-_BssEnd         = DEFINED(_BssEnd)         ? _BssEnd    : _clear_end;
-_SpInit         = DEFINED(_SpInit)         ? _SpInit    : _EndInitStackSpace;
+bsp_initstack_size = DEFINED(StackSize)    ? StackSize  : 0x800;  /* 2 kB   */
 
-_InitStackSize  = DEFINED(StackSize)       ? StackSize  : 0x800;  /* 2 kB   */
-_TopRamReserved = DEFINED(_TopRamReserved) ? _TopRamReserved : 0;
-
-RamBase        = DEFINED(_SdramBase)      ? _SdramBase : _SdramBase;
-RamSize        = DEFINED(_SdramSize)      ? _SdramSize : _SdramSize;
-HeapSize       = DEFINED(HeapSize)       ? HeapSize   : 0x0;
-_VBR            = DEFINED(_VBR)            ? _VBR       : RamBase;
+_VBR            = DEFINED(_VBR)            ? _VBR       : _SdramBase;
 
 __MBAR          = DEFINED(__MBAR)          ? __MBAR     : 0xFE000000;
 
-ENTRY(start)
 MEMORY
 {
-    sdram      : ORIGIN = 0xF0040000, LENGTH = 128M - 256K
+    sdram      : ORIGIN = 0xF0000000, LENGTH = 128M
     boot_flash : ORIGIN = 0xFC000000, LENGTH = 32M
 }
 
-SECTIONS
-{
-     
-    _header_offset = 0;
-    
-    /*
-     * Text, data and bss segments .vectors          
-     */    
-    .vectors : {
-                 *(.vectors*)
-               } >sdram
-    .text : {
-       
-        *(.text*)
-        *(.ram_code)
-
-        /*
-         * C++ constructors/destructors
-         */
-        *(.gnu.linkonce.t.*)
-
-        /*
-         * Initialization and finalization code.
-              *
-              * Various files can provide initialization and finalization
-         * functions.  crtbegin.o and crtend.o are two instances. The
-         * body of these functions are in .init and .fini sections. We
-         * accumulate the bodies here, and prepend function prologues
-         * from crti.o and function epilogues from crtn.o. crti.o must
-         * be linked first; crtn.o must be linked last.  Because these
-         * are wildcards, it doesn't matter if the user does not
-         * actually link against crti.o and crtn.o; the linker won't
-         * look for a file to match a wildcard.  The wildcard also
-         * means that it doesn't matter which directory crti.o and
-         * crtn.o are in. 
-         */
-        PROVIDE (_init = .);
-        *crti.o(.init)
-        *(.init)
-        *crtn.o(.init)
-        PROVIDE (_fini = .);
-        *crti.o(.fini)
-        *(.fini)
-        *crtn.o(.fini)
-
-        /*
-         * Special FreeBSD sysctl sections.
-         */
-        . = ALIGN (16);
-        __start_set_sysctl_set = .;
-        *(set_sysctl_*);
-        __stop_set_sysctl_set = ABSOLUTE(.);
-        *(set_domain_*);
-        *(set_pseudo_*);
-
+REGION_ALIAS ("REGION_TEXT", sdram);
+REGION_ALIAS ("REGION_TEXT_LOAD", sdram);
+REGION_ALIAS ("REGION_DATA", sdram);
+REGION_ALIAS ("REGION_DATA_LOAD", sdram);
 
-        /*
-         * C++ constructors/destructors
-         *
-         * gcc uses crtbegin.o to find the start of the constructors
-         * and destructors so we make sure it is first.  Because this
-         * is a wildcard, it doesn't matter if the user does not
-         * actually link against crtbegin.o; the linker won't look for
-         * a file to match a wildcard.  The wildcard also means that
-         * it doesn't matter which directory crtbegin.o is in. The
-         * constructor and destructor list are terminated in
-         * crtend.o.  The same comments apply to it.
-         */
-        . = ALIGN (16);
-        *crtbegin.o(.ctors)
-        *(.ctors)
-        *crtend.o(.ctors)
-        *crtbegin.o(.dtors)
-        *(.dtors)
-        *crtend.o(.dtors)
-
-        /*
-         * Exception frame info
-         */
-        . = ALIGN (16);
-        *(.eh_frame)
-
-        /*
-         * Read-only data
-         */
-        . = ALIGN (16);
-        _rodata_start = . ;
-        *(.rodata*)
-        *(.gnu.linkonce.r*)
-        
-        . = ALIGN (16);
-
-        *(.console_gdb_xfer)
-        *(.bootstrap_data)
-        . = ALIGN(16);
-        _estuff = .;
-    PROVIDE (_etext = .);
-    } >sdram
-        
-        .data : {
-        /*.data : {*/
-            PROVIDE( _data_dest_start = . );
-            PROVIDE( _copy_start = .);
-            *(.data*)
-            *(.gnu.linkonce.d*)
-            *(.gcc_except_table*)
-            *(.jcr)
-            . = ALIGN (16);
-            PROVIDE (_edata = .);
-        PROVIDE (_copy_end = .);
-        PROVIDE (_data_dest_end = . );
-        } >sdram
-
-        _data_src_start = _etext; /*LOADADDR(.data);*/
-        _data_src_end = _data_src_start + SIZEOF(.data);        
-        
-        .bss : {
-               PROVIDE (_clear_start = .);
-                *(.bss*)
-                *(COMMON)
-                . = ALIGN (16);
-                PROVIDE (end = .);
-                PROVIDE (_clear_end = .);
-                . = ALIGN (4);
-                PROVIDE (_StartInitStackSpace = .);
-                /*. = _StartInitStackSpace + _InitStackSize;*/
-                . += _InitStackSize;
-                PROVIDE (_EndInitStackSpace = .);
-                PROVIDE (WorkAreaBase = .);
-        } >sdram
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-
-PROVIDE (end_of_all = .);  
-}
+INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine
index a2e92a8cb0..b1531f6cf8 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine
@@ -63,170 +63,22 @@ _BootFlashSize  = DEFINED(_BootFlashSize)  ? _BootFlashSize : (2 * 1024*1024);
 _CodeFlashBase  = DEFINED(_CodeFlashBase)  ? _CodeFlashBase : 0xE0000000;
 _CodeFlashSize  = DEFINED(_CodeFlashSize)  ? _CodeFlashSize : (16 * 1024*1024);
 
-_VectorRam      = DEFINED(_VectorRam)      ? _VectorRam : _SdramBase;
-_DataRam        = DEFINED(_DataRam)        ? _DataRam   : _data_dest_start;
-_DataRom        = DEFINED(_DataRom)        ? _DataRom   : _data_src_start;
-_DataEnd        = DEFINED(_DataEnd)        ? _DataEnd   : _data_dest_end;
-_BssStart       = DEFINED(_BssStart)       ? _BssStart  : _clear_start;
-_BssEnd         = DEFINED(_BssEnd)         ? _BssEnd    : _clear_end;
-_SpInit         = DEFINED(_SpInit)         ? _SpInit    : _EndInitStackSpace;
+bsp_initstack_size = DEFINED(StackSize)    ? StackSize  : 0x800;  /* 2 kB   */
 
-_InitStackSize  = DEFINED(StackSize)       ? StackSize  : 0x800;  /* 2 kB   */
-_TopRamReserved = DEFINED(_TopRamReserved) ? _TopRamReserved : 0;
-
-RamBase        = DEFINED(_SdramBase)      ? _SdramBase : _SdramBase;
-RamSize        = DEFINED(_SdramSize)      ? _SdramSize : _SdramSize;
-HeapSize       = DEFINED(HeapSize)       ? HeapSize   : 0x0;
-_VBR            = DEFINED(_VBR)            ? _VBR       : RamBase;
+_VBR            = DEFINED(_VBR)            ? _VBR       : _SdramBase;
 
 __MBAR          = DEFINED(__MBAR)          ? __MBAR     : 0x10000000;
 
-ENTRY(start)
 MEMORY
 {
-    sdram      : ORIGIN = 0x400     , LENGTH = 64M - 0x400
+    sdram      : ORIGIN = 0x00000000, LENGTH = 64M
     code_flash : ORIGIN = 0xE0000000, LENGTH = 16M
     boot_flash : ORIGIN = 0xFF800000, LENGTH = 2M
 }
 
-SECTIONS
-{
-     
-    _header_offset = 0;
-    
-    /*
-     * Text, data and bss segments .vectors          
-     */    
-    .vectors : {
-                 *(.vectors*)
-               } >sdram
-    .text : {
-       
-        *(.text*)
-        *(.ram_code)
-
-        /*
-         * C++ constructors/destructors
-         */
-        *(.gnu.linkonce.t.*)
-
-        /*
-         * Initialization and finalization code.
-              *
-              * Various files can provide initialization and finalization
-         * functions.  crtbegin.o and crtend.o are two instances. The
-         * body of these functions are in .init and .fini sections. We
-         * accumulate the bodies here, and prepend function prologues
-         * from crti.o and function epilogues from crtn.o. crti.o must
-         * be linked first; crtn.o must be linked last.  Because these
-         * are wildcards, it doesn't matter if the user does not
-         * actually link against crti.o and crtn.o; the linker won't
-         * look for a file to match a wildcard.  The wildcard also
-         * means that it doesn't matter which directory crti.o and
-         * crtn.o are in. 
-         */
-        PROVIDE (_init = .);
-        *crti.o(.init)
-        *(.init)
-        *crtn.o(.init)
-        PROVIDE (_fini = .);
-        *crti.o(.fini)
-        *(.fini)
-        *crtn.o(.fini)
-
-        /*
-         * Special FreeBSD sysctl sections.
-         */
-        . = ALIGN (16);
-        __start_set_sysctl_set = .;
-        *(set_sysctl_*);
-        __stop_set_sysctl_set = ABSOLUTE(.);
-        *(set_domain_*);
-        *(set_pseudo_*);
-
+REGION_ALIAS ("REGION_TEXT", sdram);
+REGION_ALIAS ("REGION_TEXT_LOAD", sdram);
+REGION_ALIAS ("REGION_DATA", sdram);
+REGION_ALIAS ("REGION_DATA_LOAD", sdram);
 
-        /*
-         * C++ constructors/destructors
-         *
-         * gcc uses crtbegin.o to find the start of the constructors
-         * and destructors so we make sure it is first.  Because this
-         * is a wildcard, it doesn't matter if the user does not
-         * actually link against crtbegin.o; the linker won't look for
-         * a file to match a wildcard.  The wildcard also means that
-         * it doesn't matter which directory crtbegin.o is in. The
-         * constructor and destructor list are terminated in
-         * crtend.o.  The same comments apply to it.
-         */
-        . = ALIGN (16);
-        *crtbegin.o(.ctors)
-        *(.ctors)
-        *crtend.o(.ctors)
-        *crtbegin.o(.dtors)
-        *(.dtors)
-        *crtend.o(.dtors)
-
-        /*
-         * Exception frame info
-         */
-        . = ALIGN (16);
-        *(.eh_frame)
-
-        /*
-         * Read-only data
-         */
-        . = ALIGN (16);
-        _rodata_start = . ;
-        *(.rodata*)
-        *(.gnu.linkonce.r*)
-        
-        . = ALIGN (16);
-
-        *(.console_gdb_xfer)
-        *(.bootstrap_data)
-        . = ALIGN(16);
-        _estuff = .;
-    PROVIDE (_etext = .);
-    } >sdram
-        
-        .data : {
-        /*.data : {*/
-            PROVIDE( _data_dest_start = . );
-            PROVIDE( _copy_start = .);
-            *(.data*)
-            *(.gnu.linkonce.d*)
-            *(.gcc_except_table*)
-            *(.jcr)
-            . = ALIGN (16);
-            PROVIDE (_edata = .);
-        PROVIDE (_copy_end = .);
-        PROVIDE (_data_dest_end = . );
-        } >sdram
-
-        _data_src_start = _etext; /*LOADADDR(.data);*/
-        _data_src_end = _data_src_start + SIZEOF(.data);        
-        
-        .bss : {
-               PROVIDE (_clear_start = .);
-                *(.bss*)
-                *(COMMON)
-                . = ALIGN (16);
-                PROVIDE (end = .);
-                PROVIDE (_clear_end = .);
-                . = ALIGN (4);
-                PROVIDE (_StartInitStackSpace = .);
-                /*. = _StartInitStackSpace + _InitStackSize;*/
-                . += _InitStackSize;
-                PROVIDE (_EndInitStackSpace = .);
-                PROVIDE (WorkAreaBase = .);
-        } >sdram
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-
-PROVIDE (end_of_all = .);  
-}
+INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash
index d08470730f..f828b71f5d 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash
@@ -63,169 +63,22 @@ _BootFlashSize = DEFINED(_BootFlashSize)  ? _BootFlashSize : (2 * 1024 * 1024);
 _CodeFlashBase = DEFINED(_CodeFlashBase)  ? _CodeFlashBase : 0xE0000000;
 _CodeFlashSize = DEFINED(_CodeFlashSize)  ? _CodeFlashSize : (16 * 1024 * 1024);
 
-_VectorRam     = DEFINED(_VectorRam)      ? _VectorRam     : _SdramBase;
-_DataRam       = DEFINED(_DataRam)        ? _DataRam       : _data_dest_start;
-_DataRom       = DEFINED(_DataRom)        ? _DataRom       : _data_src_start;
-_DataEnd       = DEFINED(_DataEnd)        ? _DataEnd       : _data_dest_end;
-_BssStart      = DEFINED(_BssStart)       ? _BssStart      : _clear_start;
-_BssEnd        = DEFINED(_BssEnd)         ? _BssEnd        : _clear_end;
-_SpInit        = DEFINED(_SpInit)         ? _SpInit        : _EndInitStackSpace;
-_InitStackSize = DEFINED(StackSize)       ? StackSize      : 0x2000;  /* 8 kB   */
-_TopRamReserved= DEFINED(_TopRamReserved) ? _TopRamReserved : 0;
+bsp_initstack_size = DEFINED(StackSize)    ? StackSize  : 0x800;  /* 2 kB   */
 
-RamBase       = DEFINED(_SdramBase)      ? _SdramBase      : _SdramBase;
-RamSize       = DEFINED(_SdramSize)      ? _SdramSize      : _SdramSize;
-HeapSize      = DEFINED(HeapSize)       ? HeapSize       : 0x0;
-_VBR           = DEFINED(_VBR)            ? _VBR            : RamBase;
+_VBR            = DEFINED(_VBR)            ? _VBR       : _SdramBase;
 
-__MBAR         = DEFINED(__MBAR)          ? __MBAR          : 0x10000000;
+__MBAR          = DEFINED(__MBAR)          ? __MBAR     : 0x10000000;
 
-ENTRY(start)
 MEMORY
 {
-    sdram      : ORIGIN = 0x400     , LENGTH = 64M - 0x400
+    sdram      : ORIGIN = 0x00000000, LENGTH = 64M
     code_flash : ORIGIN = 0xE0000000, LENGTH = 16M
     boot_flash : ORIGIN = 0xFF800000, LENGTH = 2M
 }
 
-SECTIONS
-{
-     
-    _header_offset = 0;
-    
-    /*
-     * Text, data and bss segments .vectors          
-     */    
-    .vectors : {
-                 *(.vectors*)
-               } >boot_flash
-    .text : {
-       
-        *(.text*)
-        *(.ram_code)
-
-        /*
-         * C++ constructors/destructors
-         */
-        *(.gnu.linkonce.t.*)
-
-        /*
-         * Initialization and finalization code.
-              *
-              * Various files can provide initialization and finalization
-         * functions.  crtbegin.o and crtend.o are two instances. The
-         * body of these functions are in .init and .fini sections. We
-         * accumulate the bodies here, and prepend function prologues
-         * from crti.o and function epilogues from crtn.o. crti.o must
-         * be linked first; crtn.o must be linked last.  Because these
-         * are wildcards, it doesn't matter if the user does not
-         * actually link against crti.o and crtn.o; the linker won't
-         * look for a file to match a wildcard.  The wildcard also
-         * means that it doesn't matter which directory crti.o and
-         * crtn.o are in. 
-         */
-        PROVIDE (_init = .);
-        *crti.o(.init)
-        *(.init)
-        *crtn.o(.init)
-        PROVIDE (_fini = .);
-        *crti.o(.fini)
-        *(.fini)
-        *crtn.o(.fini)
-
-        /*
-         * Special FreeBSD sysctl sections.
-         */
-        . = ALIGN (16);
-        __start_set_sysctl_set = .;
-        *(set_sysctl_*);
-        __stop_set_sysctl_set = ABSOLUTE(.);
-        *(set_domain_*);
-        *(set_pseudo_*);
-
-
-        /*
-         * C++ constructors/destructors
-         *
-         * gcc uses crtbegin.o to find the start of the constructors
-         * and destructors so we make sure it is first.  Because this
-         * is a wildcard, it doesn't matter if the user does not
-         * actually link against crtbegin.o; the linker won't look for
-         * a file to match a wildcard.  The wildcard also means that
-         * it doesn't matter which directory crtbegin.o is in. The
-         * constructor and destructor list are terminated in
-         * crtend.o.  The same comments apply to it.
-         */
-        . = ALIGN (16);
-        *crtbegin.o(.ctors)
-        *(.ctors)
-        *crtend.o(.ctors)
-        *crtbegin.o(.dtors)
-        *(.dtors)
-        *crtend.o(.dtors)
+REGION_ALIAS ("REGION_TEXT", boot_flash);
+REGION_ALIAS ("REGION_TEXT_LOAD", boot_flash);
+REGION_ALIAS ("REGION_DATA", sdram);
+REGION_ALIAS ("REGION_DATA_LOAD", boot_flash);
 
-        /*
-         * Exception frame info
-         */
-        . = ALIGN (16);
-        *(.eh_frame)
-
-        /*
-         * Read-only data
-         */
-        . = ALIGN (16);
-        _rodata_start = . ;
-        *(.rodata*)
-        *(.gnu.linkonce.r*)
-        
-        . = ALIGN (16);
-
-        *(.console_gdb_xfer)
-        *(.bootstrap_data)
-        . = ALIGN(16);
-        _estuff = .;
-    PROVIDE (_etext = .);
-    } >boot_flash
-        
-        .data : AT(LOADADDR(.text) + SIZEOF(.text)) {
-        /*.data : {*/
-            PROVIDE( _data_dest_start = . );
-            PROVIDE( _copy_start = .);
-            *(.data*)
-            *(.gnu.linkonce.d*)
-            *(.gcc_except_table*)
-            *(.jcr)
-            . = ALIGN (16);
-            PROVIDE (_edata = .);
-        PROVIDE (_copy_end = .);
-        PROVIDE (_data_dest_end = . );
-        } >sdram
-
-        _data_src_start = _etext; /*LOADADDR(.data);*/
-        _data_src_end = _data_src_start + SIZEOF(.data);        
-        
-        .bss : {
-               PROVIDE (_clear_start = .);
-                *(.bss*)
-                *(COMMON)
-                . = ALIGN (16);
-                PROVIDE (end = .);
-                PROVIDE (_clear_end = .);
-                . = ALIGN (4);
-                PROVIDE (_StartInitStackSpace = .);
-                /*. = _StartInitStackSpace + _InitStackSize;*/
-                . += _InitStackSize;
-                PROVIDE (_EndInitStackSpace = .);
-                PROVIDE (WorkAreaBase = .);
-        } >sdram
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-
-PROVIDE (end_of_all = .);  
-}
+INCLUDE linkcmds.base