diff options
| author | wdenk <wdenk> | 2004-02-08 19:38:38 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-08 19:38:38 +0000 |
| commit | f6e20fc6ca5a45316f94743d8b60dce4d9766bc8 (patch) | |
| tree | cdea7c7227b937ff231d98e50e64b6fa447bacda /cpu/sa1100 | |
| parent | f4863a7aec41f1f78fe93eade700b15b287a5ef7 (diff) | |
| download | u-boot-f6e20fc6ca5a45316f94743d8b60dce4d9766bc8.zip u-boot-f6e20fc6ca5a45316f94743d8b60dce4d9766bc8.tar.gz u-boot-f6e20fc6ca5a45316f94743d8b60dce4d9766bc8.tar.bz2 | |
Patch by Anders Larsen, 09 Jan 2004:
ARM memory layout fixes: the abort-stack is now set up in the
correct RAM area, and the BSS is zeroed out as it should be.
Furthermore, the magic variables 'armboot_end' and 'armboot_end_data'
of the linker scripts are replaced by '__bss_start' and '_end',
resp., which is a further step to eliminate unnecessary differences
between the implementation of the CPU architectures.
Diffstat (limited to 'cpu/sa1100')
| -rw-r--r-- | cpu/sa1100/cpu.c | 2 | ||||
| -rw-r--r-- | cpu/sa1100/start.S | 42 |
2 files changed, 27 insertions, 17 deletions
diff --git a/cpu/sa1100/cpu.c b/cpu/sa1100/cpu.c index b613fe7..34adf91 100644 --- a/cpu/sa1100/cpu.c +++ b/cpu/sa1100/cpu.c @@ -41,7 +41,7 @@ int cpu_init (void) #ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR; - IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_LEN - 4; + IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4; FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; #endif return 0; diff --git a/cpu/sa1100/start.S b/cpu/sa1100/start.S index 0c8946e..fe1316c 100644 --- a/cpu/sa1100/start.S +++ b/cpu/sa1100/start.S @@ -81,16 +81,15 @@ _armboot_start: .word _start /* - * Note: _armboot_end_data and _armboot_end are defined - * by the (board-dependent) linker script. - * _armboot_end_data is the first usable FLASH address after armboot + * These are defined in the board-specific linker script. */ -.globl _armboot_end_data -_armboot_end_data: - .word armboot_end_data -.globl _armboot_end -_armboot_end: - .word armboot_end +.globl _bss_start +_bss_start: + .word __bss_start + +.globl _bss_end +_bss_end: + .word _end #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ @@ -133,7 +132,7 @@ relocate: /* relocate U-Boot to RAM */ beq stack_setup ldr r2, _armboot_start - ldr r3, _armboot_end + ldr r3, _bss_start sub r2, r3, r2 /* r2 <- size of armboot */ add r2, r0, r2 /* r2 <- source end address */ @@ -153,6 +152,17 @@ stack_setup: #endif sub sp, r0, #12 /* leave 3 words for abort-stack */ +clear_bss: + ldr r0, _bss_start /* find start of bss segment */ + add r0, r0, #4 /* start at first byte of bss */ + ldr r1, _bss_end /* stop here */ + mov r2, #0x00000000 /* clear */ + +clbss_l:str r2, [r0] /* clear loop... */ + add r0, r0, #4 + cmp r0, r1 + bne clbss_l + ldr pc, _start_armboot _start_armboot: .word start_armboot @@ -276,9 +286,9 @@ cpu_init_crit: stmia sp, {r0 - r12} @ Calling r0-r12 add r8, sp, #S_PC - ldr r2, _armboot_end - add r2, r2, #CONFIG_STACKSIZE - sub r2, r2, #8 + ldr r2, _armboot_start + sub r2, r2, #(CONFIG_STACKSIZE+CFG_MALLOC_LEN) + sub r2, r2, #(CFG_GBL_DATA_SIZE+8) @ set base 2 words into abort stack ldmia r2, {r2 - r4} @ get pc, cpsr, old_r0 add r0, sp, #S_FRAME_SIZE @ restore sp_SVC @@ -309,9 +319,9 @@ cpu_init_crit: .endm .macro get_bad_stack - ldr r13, _armboot_end @ setup our mode stack - add r13, r13, #CONFIG_STACKSIZE @ resides at top of normal stack - sub r13, r13, #8 + ldr r13, _armboot_start @ setup our mode stack + sub r13, r13, #(CONFIG_STACKSIZE+CFG_MALLOC_LEN) + sub r13, r13, #(CFG_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack str lr, [r13] @ save caller lr / spsr mrs lr, spsr |