[PATCH] m68knommu: use Kconfig RAM config options in 68328 startup code

Switch to using the new RAM Kconfig settings, instead of linker defined
regions in ROM specific 68328 startup code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 8 deletions

diff --git a/arch/m68knommu/platform/68328/head-rom.S b/arch/m68knommu/platform/68328/head-rom.S
index 2b448a297011..234430b9551c 100644
--- a/arch/m68knommu/platform/68328/head-rom.S
+++ b/arch/m68knommu/platform/68328/head-rom.S
@@ -28,6 +28,8 @@ _ramstart:
 _ramend:
 .long   0
 
+#define RAMEND  (CONFIG_RAMBASE + CONFIG_RAMSIZE)
+
 #ifdef CONFIG_INIT_LCD
 splash_bits:
 #include "bootlogo.rh"
@@ -48,7 +50,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
@@ -73,13 +75,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   #__ramvec,      %d0
-        movel   %d0,    _ramvec
+        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
         
 /*
  * load the current task pointer and stack