summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-10-21 09:33:49 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-21 09:33:49 +0100
commit59fd3033b55642da97b4ecde0c85de78d7229675 (patch)
tree7fa600d2f172b739e5452691bb379863dbd344d9 /arch/arm
parent3c1532df5c1b54b5f6246cdef94eeb73a39fe43a (diff)
downloadlinux-59fd3033b55642da97b4ecde0c85de78d7229675.tar.bz2
ARM: fix build errors caused by selection of errata 798181
Several configurations are selecting errata 798181 without SMP being selected. This causes a warning from Kconfig: warning: (ARCH_HIGHBANK && ARCH_KEYSTONE && SOC_OMAP5 && ARCH_TEGRA_114_SOC) selects ARM_ERRATA_798181 which has unmet direct dependencies (CPU_V7 && SMP) The dependencies are compile time dependencies; select violates these, resulting in: arch/arm/kernel/built-in.o: In function `setup_processor': psci.c:(.init.text+0x808): undefined reference to `erratum_a15_798181_init' at build time. Fix this by fixing the select statements for Tegra and Highbank. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-highbank/Kconfig2
-rw-r--r--arch/arm/mach-tegra/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 8e8437dea3ce..e2ca238cf0ea 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -8,7 +8,7 @@ config ARCH_HIGHBANK
select ARM_AMBA
select ARM_ERRATA_764369
select ARM_ERRATA_775420
- select ARM_ERRATA_798181
+ select ARM_ERRATA_798181 if SMP
select ARM_GIC
select ARM_TIMER_SP804
select CACHE_L2X0
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 67a76f2dfb9f..f26428d8b62a 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -54,7 +54,7 @@ config ARCH_TEGRA_3x_SOC
config ARCH_TEGRA_114_SOC
bool "Enable support for Tegra114 family"
select HAVE_ARM_ARCH_TIMER
- select ARM_ERRATA_798181
+ select ARM_ERRATA_798181 if SMP
select ARM_L1_CACHE_SHIFT_6
select PINCTRL_TEGRA114
help