Commit 59fd3033 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3c1532df
...@@ -8,7 +8,7 @@ config ARCH_HIGHBANK ...@@ -8,7 +8,7 @@ config ARCH_HIGHBANK
select ARM_AMBA select ARM_AMBA
select ARM_ERRATA_764369 select ARM_ERRATA_764369
select ARM_ERRATA_775420 select ARM_ERRATA_775420
select ARM_ERRATA_798181 select ARM_ERRATA_798181 if SMP
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CACHE_L2X0 select CACHE_L2X0
......
...@@ -54,7 +54,7 @@ config ARCH_TEGRA_3x_SOC ...@@ -54,7 +54,7 @@ config ARCH_TEGRA_3x_SOC
config ARCH_TEGRA_114_SOC config ARCH_TEGRA_114_SOC
bool "Enable support for Tegra114 family" bool "Enable support for Tegra114 family"
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select ARM_ERRATA_798181 select ARM_ERRATA_798181 if SMP
select ARM_L1_CACHE_SHIFT_6 select ARM_L1_CACHE_SHIFT_6
select PINCTRL_TEGRA114 select PINCTRL_TEGRA114
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment