In preparation of moving the handling of the LC0 object to a later stage
in the decompressor startup code, move out _edata and the initial value
of the stack pointer, which are now used in two places, and are needed
earlier than the remaining contents of LC0.
Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
---
arch/arm/boot/compressed/head.S | 35 ++++++++++----------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index bb674febf640..449457d00c4e 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -259,19 +259,17 @@ not_angel:
* Find the start of physical memory.
* Try the DTB first, if available.
*/
- adr r0, LC0
- ldr r1, [r0] @ get absolute LC0
- ldr sp, [r0, #24] @ get stack location
- sub r1, r0, r1 @ compute relocation offset
- add sp, sp, r1 @ apply relocation
+ adr r0, LC1
+ ldr sp, [r0] @ get stack location
+ add sp, sp, r0 @ apply relocation
#ifdef CONFIG_ARM_APPENDED_DTB
/*
* Look for an appended DTB. If found, use it and
* move stack away from it.
*/
- ldr r6, [r0, #12] @ get &_edata
- add r6, r6, r1 @ relocate it
+ ldr r6, [r0, #4] @ get &_edata
+ add r6, r6, r0 @ relocate it
ldmia r6, {r0, r5} @ get DTB signature and size
#ifndef __ARMEB__
ldr r1, =0xedfe0dd0 @ sig is 0xd00dfeed big endian
@@ -345,22 +343,20 @@ not_angel:
orrcc r4, r4, #1 @ remember we skipped cache_on
blcs cache_on
-restart: adr r0, LC0
- ldmia r0, {r1, r2, r3, r6, r11, r12}
- ldr sp, [r0, #24]
+restart: adr r0, LC1
+ ldr sp, [r0]
+ ldr r6, [r0, #4]
+ add sp, sp, r0
+ add r6, r6, r0
- /*
- * We might be running at a different address. We need
- * to fix up various pointers.
- */
+ adr r0, LC0
+ ldmia r0, {r1, r2, r3, r11, r12}
sub r0, r0, r1 @ calculate the delta offset
- add r6, r6, r0 @ _edata
get_inflated_image_size r9, r10, lr
#ifndef CONFIG_ZBOOT_ROM
/* malloc space is above the relocated stack (64k max) */
- add sp, sp, r0
add r10, sp, #0x10000
#else
/*
@@ -712,12 +708,15 @@ not_relocated: mov r0, #0
LC0: .word LC0 @ r1
.word __bss_start @ r2
.word _end @ r3
- .word _edata @ r6
.word _got_start @ r11
.word _got_end @ ip
- .word .L_user_stack_end @ sp
.size LC0, . - LC0
+ .type LC1, #object
+LC1: .word .L_user_stack_end - LC1 @ sp
+ .word _edata - LC1 @ r6
+ .size LC1, . - LC1
+
.Lheadroom:
.word _end - restart + 16384 + 1024*1024
--
2.17.1
