diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-29 12:00:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-29 12:00:57 -0500 |
| commit | 2402c93130c09b881f9cc1369459fb49d9fa0f74 (patch) | |
| tree | b98fcb4632c62e8693d8ee1acfa3af55c52f634a /arch/arm/lib | |
| parent | c087b5ad974441d1408c028eb7087d86b6d127e9 (diff) | |
| parent | ade37460a944aed36ae6ee634c4d4a9a22690461 (diff) | |
Merge tag 'v2022.01-rc3' into next
Prepare v2022.01-rc3
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/crt0_64.S | 4 | ||||
| -rw-r--r-- | arch/arm/lib/memcpy.S | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 611affb74c..84c04bd43a 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -108,6 +108,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/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index f7fb77235c..eee7a219ce 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -210,7 +210,7 @@ ENTRY(memcpy) orr r9, r9, ip, lspush #\push mov ip, ip, lspull #\pull orr ip, ip, lr, lspush #\push - str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f + str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f bge 12b PLD( cmn r2, #96 ) PLD( bge 13b ) |