diff options
| author | Oded Gabbay <oded.gabbay@gmail.com> | 2016-12-27 09:19:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-14 21:46:27 (GMT) |
| commit | 4b105f6ca96a1489ec094f10f0d1c5e95666463e (patch) | |
| tree | 03ab25e176fc22d7138b2e0f7b48a9d9c966b9b5 | |
| parent | 22802f4e3a0a8ead928a0af06b7719b604a98afb (diff) | |
| download | u-boot-fsl-qoriq-4b105f6ca96a1489ec094f10f0d1c5e95666463e.tar.xz | |
armv8: fix #if around spin-table code in start.S
Using CONFIG_IS_ENABLED() doesn't work in SPL. This patch replaces the only
occurrence of CONFIG_IS_ENABLED() in start.S to a regular #if defined().
It also adds "&& !defined(CONFIG_SPL_BUILD)" to that #if statement because
the spin-table code can't currently work in SPL, and the spin-table file
isn't even compiled in SPL.
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 140609d..9535057 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -98,7 +98,7 @@ save_boot_params_ret: /* Processor specific initialization */ bl lowlevel_init -#if CONFIG_IS_ENABLED(ARMV8_SPIN_TABLE) +#if defined(CONFIG_ARMV8_SPIN_TABLE) && !defined(CONFIG_SPL_BUILD) branch_if_master x0, x1, master_cpu b spin_table_secondary_jump /* never return */ |