diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 05:36:04 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-07 04:33:10 -0400 |
| commit | 8f90cce5a9b0ecf3cc6d3d3046cbfc19fc957dcb (patch) | |
| tree | 5d76606612094252cf45c74beee775a140e2c54e | |
| parent | 113f7ae5a9cebfc536d71d25a8b6f83f7fe93789 (diff) | |
ARM: soc: dependency warnings for errata
The PL310_ERRATA_753970 and ARM_ERRATA_764369 symbols only make sense
when the base features for them are enabled, so select them
conditionally in Kconfig to avoid warnings like:
warning: (UX500_SOC_COMMON) selects PL310_ERRATA_753970 which has unmet direct dependencies (CACHE_PL310)
warning: (ARCH_TEGRA_2x_SOC && ARCH_TEGRA_3x_SOC && UX500_SOC_COMMON) selects ARM_ERRATA_764369 which has unmet direct dependencies (CPU_V7 && SMP)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 9077aaa398d9..b5f62ab04e84 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
| @@ -16,7 +16,7 @@ config ARCH_TEGRA_2x_SOC | |||
| 16 | select ARM_ERRATA_742230 | 16 | select ARM_ERRATA_742230 |
| 17 | select ARM_ERRATA_751472 | 17 | select ARM_ERRATA_751472 |
| 18 | select ARM_ERRATA_754327 | 18 | select ARM_ERRATA_754327 |
| 19 | select ARM_ERRATA_764369 | 19 | select ARM_ERRATA_764369 if SMP |
| 20 | select PL310_ERRATA_727915 if CACHE_L2X0 | 20 | select PL310_ERRATA_727915 if CACHE_L2X0 |
| 21 | select PL310_ERRATA_769419 if CACHE_L2X0 | 21 | select PL310_ERRATA_769419 if CACHE_L2X0 |
| 22 | select CPU_FREQ_TABLE if CPU_FREQ | 22 | select CPU_FREQ_TABLE if CPU_FREQ |
| @@ -38,7 +38,7 @@ config ARCH_TEGRA_3x_SOC | |||
| 38 | select ARM_ERRATA_743622 | 38 | select ARM_ERRATA_743622 |
| 39 | select ARM_ERRATA_751472 | 39 | select ARM_ERRATA_751472 |
| 40 | select ARM_ERRATA_754322 | 40 | select ARM_ERRATA_754322 |
| 41 | select ARM_ERRATA_764369 | 41 | select ARM_ERRATA_764369 if SMP |
| 42 | select PL310_ERRATA_769419 if CACHE_L2X0 | 42 | select PL310_ERRATA_769419 if CACHE_L2X0 |
| 43 | select CPU_FREQ_TABLE if CPU_FREQ | 43 | select CPU_FREQ_TABLE if CPU_FREQ |
| 44 | help | 44 | help |
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 53d3d46dec12..18755f132267 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -5,9 +5,9 @@ config UX500_SOC_COMMON | |||
| 5 | default y | 5 | default y |
| 6 | select ARM_GIC | 6 | select ARM_GIC |
| 7 | select HAS_MTU | 7 | select HAS_MTU |
| 8 | select PL310_ERRATA_753970 | 8 | select PL310_ERRATA_753970 if CACHE_PL310 |
| 9 | select ARM_ERRATA_754322 | 9 | select ARM_ERRATA_754322 |
| 10 | select ARM_ERRATA_764369 | 10 | select ARM_ERRATA_764369 if SMP |
| 11 | select CACHE_L2X0 | 11 | select CACHE_L2X0 |
| 12 | select PINCTRL | 12 | select PINCTRL |
| 13 | select PINCTRL_NOMADIK | 13 | select PINCTRL_NOMADIK |