diff options
| author | Stefano Babic <sbabic@denx.de> | 2019-03-31 20:54:10 +0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-03-31 20:54:10 +0300 |
| commit | 66c433ed4342e5761ee9b048c85fe47d31130b2e (patch) | |
| tree | 60977b825765ebe490b01aae2154002eeea6a76b /arch/arm/cpu/armv8/start.S | |
| parent | 4b387deb78dcbe491c1f73fdd758f4ca3307bbbe (diff) | |
| parent | c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (diff) | |
| download | u-boot-66c433ed4342e5761ee9b048c85fe47d31130b2e.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/cpu/armv8/start.S')
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 12a78ee38b..fe52166e28 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -88,7 +88,7 @@ pie_fixup_done: bl reset_sctrl #endif -#if defined(CONFIG_ARMV8__SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) .macro set_vbar, regname, reg msr \regname, \reg .endm @@ -354,7 +354,7 @@ ENDPROC(smp_kick_all_cpus) /*-----------------------------------------------------------------------*/ ENTRY(c_runtime_cpu_setup) -#if defined(CONFIG_ARMV8__SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) /* Relocate vBAR */ adr x0, vectors switch_el x1, 3f, 2f, 1f |