linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / m68knommu / platform / 68328 / head-rom.S

diff --git a/arch/m68knommu/platform/68328/head-rom.S b/arch/m68knommu/platform/68328/head-rom.S
index 6ec77d3..2b448a2 100644 (file)
--- a/arch/m68knommu/platform/68328/head-rom.S
+++ b/arch/m68knommu/platform/68328/head-rom.S
@@ -1,3 +1,4 @@
+#include <linux/config.h>
        
        .global _start
        .global _stext
@@ -27,8 +28,6 @@ _ramstart:
 _ramend:
 .long   0
 
-#define        RAMEND  (CONFIG_RAMBASE + CONFIG_RAMSIZE)
-
 #ifdef CONFIG_INIT_LCD
 splash_bits:
 #include "bootlogo.rh"
@@ -49,7 +48,7 @@ _stext:       movew   #0x2700,%sr
        moveb   #0x81,   0xfffffA27     /* LCKCON */
        movew   #0xff00, 0xfffff412     /* LCD pins */
 #endif
-       moveal  #RAMEND-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
+       moveal  #__ramend-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
        movew   #32767, %d0  /* PLL settle wait loop */
 1:     subq    #1, %d0
        bne     1b
@@ -74,13 +73,13 @@ _stext:     movew   #0x2700,%sr
        bhi     1b
 
         movel   #_sdata, %d0    
-        movel   %d0, _rambase        
-        movel   #_ebss, %d0
-        movel   %d0, _ramstart
-       movel   #RAMEND-CONFIG_MEMORY_RESERVE*0x100000, %d0
-       movel   %d0, _ramend
-       movel   #CONFIG_VECTORBASE,     %d0
-       movel   %d0, _ramvec
+        movel   %d0,    _rambase        
+        movel   #_ebss,  %d0
+        movel   %d0,    _ramstart
+       movel   #__ramend-CONFIG_MEMORY_RESERVE*0x100000, %d0
+       movel   %d0,    _ramend
+       movel   #__ramvec,      %d0
+       movel   %d0,    _ramvec
        
 /*
  * load the current task pointer and stack