1 files changed, 13 insertions, 30 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
index 0a716924c1..297579ce25 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
@@ -18,21 +18,17 @@
  */
 
 /*
- * a.out format doesn't handle prom images very well
- */
-OUTPUT_FORMAT(coff-m68k)
-
-/*
  * Declare some sizes.
  */
-RamSize = DEFINED(RamSize) ? RamSize : 4M;
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
-StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
+_RamBase = 0x10000000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
+_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
 /*
  * Declare on-board memory.
  * It would be nice if the ram length could be given as
- * LENGTH=RamSize, but gld doesn't allow non-constant
+ * LENGTH=_RamSize, but gld doesn't allow non-constant
  * values in the LENGTH expression.  
  */
 MEMORY {
@@ -50,11 +46,6 @@ ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
  * Load objects
  */
 SECTIONS {
-	/*
-	 * Hardware variations
-	 */
-	_RamSize = RamSize;
-	__RamSize = RamSize;
 
         /*
          * Boot PROM
@@ -68,8 +59,7 @@ SECTIONS {
          * Dynamic RAM
          */
         ram : {
-                _RamBase = .;
-                __RamBase = .;
+                . = .;
         } >ram
 
         /*
@@ -154,27 +144,20 @@ SECTIONS {
                 PROVIDE (_copy_end = .);
         } >ram
         .bss : {
-		M68Kvec = .;
-		_M68Kvec = .;
-		. += (256 * 4);
-                PROVIDE (_bss_start = .);
-                PROVIDE (_clear_start = .);
+                M68Kvec = .;
+                . += (256 * 4);
+                _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
 
        /*