diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2021-11-13 18:34:59 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-18 16:17:58 -0500 |
| commit | 1f69ae4ede5a30cf85e89eb4eb40686f45cdd972 (patch) | |
| tree | 7ee5da4544d3cc4e8b824944bcfb4da4c67682f8 | |
| parent | 56696514dd3cda9da8cda5b3740a0170cf57de88 (diff) | |
| download | u-boot-WIP/2021-11-18-regression-fixes.tar.gz | |
arm64: Add missing GD_FLG_SKIP_RELOC handlingWIP/2021-11-18-regression-fixes
In case U-Boot enters relocation with GD_FLG_SKIP_RELOC, skip the
relocation. The code still has to set up new_gd pointer and new
stack pointer.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/lib/crt0_64.S | 4 | ||||
| -rw-r--r-- | lib/asm-offsets.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 680e674fa33..28c8356aeea 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -104,6 +104,10 @@ ENTRY(_main) bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ ldr x18, [x18, #GD_NEW_GD] /* x18 <- gd->new_gd */ + /* Skip relocation in case gd->gd_flags & GD_FLG_SKIP_RELOC */ + ldr x0, [x18, #GD_FLAGS] /* x0 <- gd->flags */ + tbnz x0, 11, relocation_return /* GD_FLG_SKIP_RELOC is bit 11 */ + adr lr, relocation_return #if CONFIG_POSITION_INDEPENDENT /* Add in link-vs-runtime offset */ diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index c691066332d..0808cd4b0c1 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -29,6 +29,9 @@ int main(void) DEFINE(GD_SIZE, sizeof(struct global_data)); DEFINE(GD_BD, offsetof(struct global_data, bd)); + + DEFINE(GD_FLAGS, offsetof(struct global_data, flags)); + #if CONFIG_VAL(SYS_MALLOC_F_LEN) DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base)); #endif |