diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2006-06-27 13:27:13 +1000 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 18:30:14 -0700 | 
| commit | f5c7726ffc994f1826415852e7196bcb6c664d44 (patch) | |
| tree | 6037de0c9992db2b206892c56e7d5d354303b2a4 /arch/m68knommu | |
| parent | d046f6118bb2a207870e35db1411b958199a3750 (diff) | |
| download | linux-f5c7726ffc994f1826415852e7196bcb6c664d44.tar.bz2 | |
[PATCH] m68knommu: use Kconfig RAM config options in 68360 ROM startup code
Switch to using the new RAM Kconfig settings, instead of linker defined
regions in ROM specific 68360 startup code.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/platform/68360/head-rom.S | 17 | 
1 files changed, 6 insertions, 11 deletions
| diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S index 0da357a4cfee..2d28c3e19a88 100644 --- a/arch/m68knommu/platform/68360/head-rom.S +++ b/arch/m68knommu/platform/68360/head-rom.S @@ -18,7 +18,6 @@  .global _start  .global _rambase -.global __ramvec  .global _ramvec  .global _ramstart  .global _ramend @@ -26,6 +25,8 @@  .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 +116,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,16 +246,10 @@ 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) @@ -298,7 +293,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.  */ |