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>
This commit is contained in:
Andre Przywara 2017-01-02 11:48:33 +00:00 committed by Jagan Teki
parent 8ed02bc2d9
commit a5168a5900
2 changed files with 3 additions and 2 deletions

View File

@ -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

View File

@ -9,6 +9,7 @@
/* reserve space for BOOT0 header information */
#define ARM_SOC_BOOT0_HOOK \
b reset; \
.space 1532
#endif /* __BOOT0_H */