Skip to content
Snippets Groups Projects
Commit b9c5081d authored by Andreas Bießmann's avatar Andreas Bießmann Committed by Wolfgang Denk
Browse files

armv7: fix relocation skip


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: default avatarAndreas Bießmann <andreas.devel@googlemail.com>
parent 1f52d89f
No related branches found
No related tags found
No related merge requests found
......@@ -166,9 +166,9 @@ stack_setup:
mov sp, r4
adr r0, _start
cmp r0, r6
#ifndef CONFIG_PRELOADER
beq jump_2_ram
cmp r0, r6
beq clear_bss /* skip relocation */
#endif
mov r1, r6 /* r1 <- scratch for copy_loop */
ldr r2, _TEXT_BASE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment