diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2017-01-02 11:48:33 +0000 |
|---|---|---|
| committer | Jagan Teki <jagan@openedev.com> | 2017-01-04 16:37:41 +0100 |
| commit | a5168a5900113b8f638a4f3b09317c4cfa991414 (patch) | |
| tree | cf4aa6c62bfb0e45983599a0b06adae05f095639 | |
| parent | 8ed02bc2d969bcab140f33f235b512194ab17d47 (diff) | |
armv8: move reset branch into boot hook
The boot0 hook we have so far is applied _after_ the initial branch
to the "reset" entry point. An upcoming change requires even this
branch to be changed, so we apply the hook macro at the earliest
point, and have the branch in the hook file as well.
This is no functional change at this point, just refactoring to simplify
upcoming patches.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jagan@openedev.com>
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/boot0.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 4f5f6d8020..ee393d737e 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -19,8 +19,6 @@ .globl _start _start: - b reset - #ifdef CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK /* * Various SoCs need something special and SoC-specific up front in @@ -29,6 +27,8 @@ _start: */ #include <asm/arch/boot0.h> ARM_SOC_BOOT0_HOOK +#else + b reset #endif .align 3 diff --git a/arch/arm/include/asm/arch-sunxi/boot0.h b/arch/arm/include/asm/arch-sunxi/boot0.h index ea5675eb9e..6f28d63d48 100644 --- a/arch/arm/include/asm/arch-sunxi/boot0.h +++ b/arch/arm/include/asm/arch-sunxi/boot0.h @@ -9,6 +9,7 @@ /* reserve space for BOOT0 header information */ #define ARM_SOC_BOOT0_HOOK \ + b reset; \ .space 1532 #endif /* __BOOT0_H */ |