diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-14 07:01:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-14 07:01:11 -0400 |
commit | 9597494ebfb60418e8a0e7565cca2b7d25512bf5 (patch) | |
tree | 3d84f37f77b366526bd7316ed74f0218ef4f0dd6 /arch/arm/cpu/armv7/ls102xa/cpu.c | |
parent | 14539bad49f0a2a53db2d57658de55ab89ab5758 (diff) | |
parent | 237c36379c76f7f6647bb11c03aa9c5cb9a4972f (diff) | |
download | u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.zip u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.tar.gz u-boot-imx-9597494ebfb60418e8a0e7565cca2b7d25512bf5.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/cpu/armv7/ls102xa/cpu.c')
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 1a640bb..75f0d8c 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -329,7 +329,7 @@ int arch_cpu_init(void) return 0; } -#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +#ifdef CONFIG_ARMV7_NONSEC /* Set the address at which the secondary core starts from.*/ void smp_set_core_boot_addr(unsigned long addr, int corenr) { |