diff options
| author | Russell King | 2014-06-19 11:19:10 +0200 |
|---|---|---|
| committer | Russell King | 2014-06-19 12:29:28 +0200 |
| commit | a641f3a6abce7e884d15adf073599bb2f2651203 (patch) | |
| tree | 1b36cb02f59de79f03ef39b016f67a1418b40884 /arch/arm/mach-omap2/Kconfig | |
| parent | ARM: 8069/1: Make thread_save_fp macro aware of THUMB2 mode (diff) | |
| download | kernel-qcow2-linux-a641f3a6abce7e884d15adf073599bb2f2651203.tar.gz kernel-qcow2-linux-a641f3a6abce7e884d15adf073599bb2f2651203.tar.xz kernel-qcow2-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-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 0ba482638ebf..2ff3f23e31b0 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -32,8 +32,8 @@ config ARCH_OMAP4 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select OMAP_INTERCONNECT - select PL310_ERRATA_588369 - select PL310_ERRATA_727915 + select PL310_ERRATA_588369 if CACHE_L2X0 + select PL310_ERRATA_727915 if CACHE_L2X0 select PM_OPP if PM select PM_RUNTIME if CPU_IDLE select ARM_ERRATA_754322 |