diff options
| author | Tom Rini <[email protected]> | 2022-02-03 15:55:02 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-02-03 15:55:02 -0500 |
| commit | 3e5f4b337d89e95af9d3700a4b055b552bf22ac4 (patch) | |
| tree | 86ff5fbee12f43f7d700d130c92009aef12fc185 /arch | |
| parent | 006fddde01da7e8b3c7cad4a35f3245edc894ab4 (diff) | |
| parent | 5b9a5b2b966bf738ca4115a9dca52d0dc9f2710d (diff) | |
Merge branch '2022-02-03-assorted-fixes'
- Update CI image to have libgnutls available.
- Assorted ARM and SPL bugfixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 37 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/u-boot-spl.lds | 4 |
2 files changed, 4 insertions, 37 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index b3eef705a53..91b00a46cce 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -104,10 +104,6 @@ pie_skip_reloc: pie_fixup_done: #endif -#ifdef CONFIG_SYS_RESET_SCTRL - bl reset_sctrl -#endif - #if defined(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) .macro set_vbar, regname, reg msr \regname, \reg @@ -195,39 +191,6 @@ slave_cpu: master_cpu: bl _main -#ifdef CONFIG_SYS_RESET_SCTRL -reset_sctrl: - switch_el x1, 3f, 2f, 1f -3: - mrs x0, sctlr_el3 - b 0f -2: - mrs x0, sctlr_el2 - b 0f -1: - mrs x0, sctlr_el1 - -0: - ldr x1, =0xfdfffffa - and x0, x0, x1 - - switch_el x1, 6f, 5f, 4f -6: - msr sctlr_el3, x0 - b 7f -5: - msr sctlr_el2, x0 - b 7f -4: - msr sctlr_el1, x0 - -7: - dsb sy - isb - b __asm_invalidate_tlb_all - ret -#endif - /*-----------------------------------------------------------------------*/ WEAK(apply_core_errata) diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds index 9edb662b094..730eb93dbc3 100644 --- a/arch/arm/cpu/armv8/u-boot-spl.lds +++ b/arch/arm/cpu/armv8/u-boot-spl.lds @@ -84,4 +84,8 @@ SECTIONS /DISCARD/ : { *(.plt*) } /DISCARD/ : { *(.interp*) } /DISCARD/ : { *(.gnu*) } + +#ifdef CONFIG_LINUX_KERNEL_IMAGE_HEADER +#include "linux-kernel-image-header-vars.h" +#endif } |