linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

armv8: fix #if around spin-table code in start.S

Browse Source 
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>
This commit is contained in:
Oded Gabbay
2016-12-27 11:19:43 +02:00
committed by Tom Rini
parent 22802f4e3a
commit 4b105f6ca9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv8/start.S
View File

@ -98,7 +98,7 @@ save_boot_params_ret:
/* Processor specific initialization */ /* Processor specific initialization */
bl lowlevel_init 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 branch_if_master x0, x1, master_cpu
b spin_table_secondary_jump b spin_table_secondary_jump
/* never return */ /* never return */