arm64: Add missing GD_FLG_SKIP_RELOC handling

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>

diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index 680e674fa3344f99cc248dd4eb70539b091756df..28c8356aeea2ead21e1c8825a61080c30d9ddcc4 100644 (file)
--- 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 c691066332de8bc38ad52b576dbdce035ea7b6ca..0808cd4b0c11d887ad4075d039e8a911516bca1a 100644 (file)
--- 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