diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2020-03-10 10:15:04 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-16 23:06:54 -0400 |
| commit | 6de299230fa63d3865501b069657ac26cedebd9a (patch) | |
| tree | c703a5b439db353fa65bb1e19625127549cf3b95 | |
| parent | 15ac0c7500f041ef80a0b7df8a192466d74e15c3 (diff) | |
| download | u-boot-6de299230fa63d3865501b069657ac26cedebd9a.tar.gz | |
arm: set the relocated gd with gd->new_gd
Simplify the arm relocation behavior and get gd directly form new_gd,
as it is already done in crt0_64.S:
ldr x18, [x18, #GD_NEW_GD] /* x18 <- gd->new_gd */
This patch avoid assumption on new GD location (new GD is below bd -
with #GD_SIZE offset).
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| -rw-r--r-- | arch/arm/lib/crt0.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index fb6c37cf51..df9dd83e40 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -127,8 +127,7 @@ ENTRY(_main) ldr r0, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ bic r0, r0, #7 /* 8-byte alignment for ABI compliance */ mov sp, r0 - ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ - sub r9, r9, #GD_SIZE /* new GD is below bd */ + ldr r9, [r9, #GD_NEW_GD] /* r9 <- gd->new_gd */ adr lr, here ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ |