minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

armv7: fix relocation skip

Browse Source 
I doubt the stack_setup() was defective before:
 we load the current location of _start and compare against destination
 of relocate_code(). If we are already there we shoud skip the
 relocation and jump over to clear_bss. Before the clear_bss was also skipped.

Signed-off-by: Andreas Biemann <andreas.devel@googlemail.com>
This commit is contained in:
Andreas Bießmann 2010-12-01 00:58:36 +01:00 committed by Wolfgang Denk
parent 1f52d89f2b
commit b9c5081d7d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/start.S
View File

@ -166,9 +166,9 @@ stack_setup:
mov sp, r4 mov sp, r4
adr r0, _start adr r0, _start
cmp r0, r6
#ifndef CONFIG_PRELOADER #ifndef CONFIG_PRELOADER
beq jump_2_ram cmp r0, r6
beq clear_bss /* skip relocation */
#endif #endif
mov r1, r6 /* r1 <- scratch for copy_loop */ mov r1, r6 /* r1 <- scratch for copy_loop */
ldr r2, _TEXT_BASE ldr r2, _TEXT_BASE