X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fm68knommu%2Fplatform%2F68360%2Fhead-rom.S;fp=arch%2Fm68knommu%2Fplatform%2F68360%2Fhead-rom.S;h=0da357a4cfee407d141321af4837bbdb5e77f67f;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=62ecf4144b3ba3ad2df0ebecbb13adca1feff5b6;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S
index 62ecf4144..0da357a4c 100644
--- a/arch/m68knommu/platform/68360/head-rom.S
+++ b/arch/m68knommu/platform/68360/head-rom.S
@@ -11,12 +11,14 @@
  * Copyright (C) 1998  D. Jeff Dionne <jeff@uclinux.org>,
  *
  */
+#include <linux/config.h>
 
 .global _stext
 .global _sbss
 .global _start
 
 .global _rambase
+.global __ramvec
 .global _ramvec
 .global _ramstart
 .global _ramend
@@ -24,8 +26,6 @@
 .global _quicc_base
 .global _periph_base
 
-#define	RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)
-
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
 #define GMR                         (_dprbase + REGB + 0x0040)
@@ -115,7 +115,7 @@ _stext:
 	nop
 	ori.w	#MCU_DISABLE_INTRPTS, %sr	/* disable interrupts: */
 	/* We should not need to setup the boot stack the reset should do it. */
-	movea.l	#RAMEND, %sp		/* set up stack at the end of DRAM:*/
+	movea.l	#__ramend, %sp		/* set up stack at the end of DRAM:*/
 
 
 set_mbar_register:
@@ -245,10 +245,16 @@ store_ram_size:
 	/* Set ram size information */
 	move.l	#_sdata, _rambase
 	move.l	#_ebss, _ramstart
-	move.l	#RAMEND, %d0
+	move.l	#__ramend, %d0
 	sub.l	#0x1000, %d0			/* Reserve 4K for stack space.*/
-	move.l	%d0, _ramend			/* Different from RAMEND.*/
+	move.l	%d0, _ramend			/* Different from __ramend.*/
 
+store_flash_size:
+	/* Set rom size information */
+	move.l	#__rom_end, %d0
+	sub.l	#__rom_start, %d0
+	move.l	%d0, rom_length
+    
 	pea	0
 	pea	env
 	pea	%sp@(4)
@@ -292,7 +298,7 @@ _dprbase:
      */
  
 .section ".data.initvect","awx"
-    .long   RAMEND	/* Reset: Initial Stack Pointer                 - 0.  */
+    .long   __ramend	/* Reset: Initial Stack Pointer                 - 0.  */
     .long   _start      /* Reset: Initial Program Counter               - 1.  */
     .long   buserr      /* Bus Error                                    - 2.  */
     .long   trap        /* Address Error                                - 3.  */