summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sti
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-06-19 10:19:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-06-19 11:29:28 +0100
commita641f3a6abce7e884d15adf073599bb2f2651203 (patch)
tree1b36cb02f59de79f03ef39b016f67a1418b40884 /arch/arm/mach-sti
parent870cbe8cb2043d63dc5f110731df57599075f53d (diff)
downloadlinux-a641f3a6abce7e884d15adf073599bb2f2651203.tar.gz
linux-a641f3a6abce7e884d15adf073599bb2f2651203.tar.bz2
linux-a641f3a6abce7e884d15adf073599bb2f2651203.zip
ARM: l2c: fix dependencies on PL310 errata symbols
A number of configurations spit out warnings similar to: warning: (SOC_IMX6 && SOC_VF610 && ARCH_OMAP4) selects PL310_ERRATA_588369 which has unmet direct dependencies (CACHE_L2X0) warning: (SOC_IMX6 && SOC_VF610 && ARCH_OMAP4) selects PL310_ERRATA_727915 which has unmet direct dependencies (CACHE_L2X0) Clean up the dependencies here: * PL310 symbols should only be selected when CACHE_L2X0 is enabled. * Since the cache-l2x0 code detects PL310 presence at runtime, and we will eventually get rid of CACHE_PL310, surround these errata options with an if CACHE_L2X0 conditional rather than repeating the dependency against each. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sti')
-rw-r--r--arch/arm/mach-sti/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index abf9ee9bbc3f..1831e9611761 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -11,8 +11,8 @@ menuconfig ARCH_STI
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP
select ARM_ERRATA_775420
- select PL310_ERRATA_753970 if CACHE_PL310
- select PL310_ERRATA_769419 if CACHE_PL310
+ select PL310_ERRATA_753970 if CACHE_L2X0
+ select PL310_ERRATA_769419 if CACHE_L2X0
help
Include support for STiH41x SOCs like STiH415/416 using the device tree
for discovery