UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2006-06-27 13:27:08 +10:00 committed by Linus Torvalds
parent 999567d829
commit d046f6118b
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/m68knommu/platform/68360/head-ram.S
View File

@ -18,7 +18,6 @@
.global _start .global _start
.global _rambase .global _rambase
.global __ramvec
.global _ramvec .global _ramvec
.global _ramstart .global _ramstart
.global _ramend .global _ramend
@ -26,6 +25,8 @@
.global _quicc_base .global _quicc_base
.global _periph_base .global _periph_base
#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)
#define REGB 0x1000 #define REGB 0x1000
#define PEPAR (_dprbase + REGB + 0x0016) #define PEPAR (_dprbase + REGB + 0x0016)
#define GMR (_dprbase + REGB + 0x0040) #define GMR (_dprbase + REGB + 0x0040)
@ -103,7 +104,7 @@ _stext:
nop nop
ori.w #MCU_DISABLE_INTRPTS, %sr /* disable interrupts: */ ori.w #MCU_DISABLE_INTRPTS, %sr /* disable interrupts: */
/* We should not need to setup the boot stack the reset should do it. */ /* 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: set_mbar_register:
moveq.l #0x07, %d1 /* Setup MBAR */ moveq.l #0x07, %d1 /* Setup MBAR */
@ -163,7 +164,7 @@ configure_memory_controller:
move.l %d0, GMR move.l %d0, GMR
configure_chip_select_0: configure_chip_select_0:
move.l #__ramend, %d0 move.l #RAMEND, %d0
subi.l #__ramstart, %d0 subi.l #__ramstart, %d0
subq.l #0x01, %d0 subq.l #0x01, %d0
eori.l #SIM_OR_MASK, %d0 eori.l #SIM_OR_MASK, %d0
@ -234,15 +235,9 @@ store_ram_size:
/* Set ram size information */ /* Set ram size information */
move.l #_sdata, _rambase move.l #_sdata, _rambase
move.l #_ebss, _ramstart move.l #_ebss, _ramstart
move.l #__ramend, %d0 move.l #RAMEND, %d0
sub.l #0x1000, %d0 /* Reserve 4K for stack space.*/ 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 0
pea env pea env
@ -286,7 +281,7 @@ _dprbase:
*/ */
.section ".data.initvect","awx" .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 _start /* Reset: Initial Program Counter - 1. */
.long buserr /* Bus Error - 2. */ .long buserr /* Bus Error - 2. */
.long trap /* Address Error - 3. */ .long trap /* Address Error - 3. */