| From 9bda71e48b826434f1a6231956603cd724c2aeba Mon Sep 17 00:00:00 2001 |
| From: Rob Herring <robh@kernel.org> |
| Date: Fri, 31 Jan 2014 15:36:10 -0600 |
| Subject: ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform |
| |
| Many V6 and V7 platforms have an L2x0 cache, so make |
| CONFIG_MIGHT_HAVE_CACHE_L2X0 visible for V6 and V7 multi-platform |
| builds. |
| |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Acked-by: Stephen Warren <swarren@nvidia.com> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| (cherry picked from commit 9352b05b6e4ef1aae53744cbd0adc0491fae5be0) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/Kconfig | 1 + |
| arch/arm/mach-cns3xxx/Kconfig | 1 - |
| arch/arm/mach-imx/Kconfig | 1 - |
| arch/arm/mach-prima2/Kconfig | 1 - |
| arch/arm/mach-shmobile/Kconfig | 1 - |
| arch/arm/mach-spear/Kconfig | 1 - |
| arch/arm/mach-sti/Kconfig | 1 - |
| arch/arm/mach-tegra/Kconfig | 1 - |
| arch/arm/mach-ux500/Kconfig | 1 - |
| arch/arm/mach-vexpress/Kconfig | 1 - |
| arch/arm/mach-zynq/Kconfig | 1 - |
| 11 files changed, 1 insertion(+), 10 deletions(-) |
| |
| diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig |
| index 145c9cb8a422..a5a497f43719 100644 |
| --- a/arch/arm/Kconfig |
| +++ b/arch/arm/Kconfig |
| @@ -919,6 +919,7 @@ config ARCH_MULTI_V7 |
| |
| config ARCH_MULTI_V6_V7 |
| bool |
| + select MIGHT_HAVE_CACHE_L2X0 |
| |
| config ARCH_MULTI_CPU_AUTO |
| def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) |
| diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig |
| index e3466887f62c..c6f58a15c95e 100644 |
| --- a/arch/arm/mach-cns3xxx/Kconfig |
| +++ b/arch/arm/mach-cns3xxx/Kconfig |
| @@ -2,7 +2,6 @@ config ARCH_CNS3XXX |
| bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 |
| select ARM_GIC |
| select CPU_V6K |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select MIGHT_HAVE_PCI |
| select PCI_DOMAINS if PCI |
| help |
| diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig |
| index 1a6a843aad66..ff2447389f27 100644 |
| --- a/arch/arm/mach-imx/Kconfig |
| +++ b/arch/arm/mach-imx/Kconfig |
| @@ -5,7 +5,6 @@ config ARCH_MXC |
| select CLKSRC_MMIO |
| select GENERIC_ALLOCATOR |
| select GENERIC_IRQ_CHIP |
| - select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 |
| select PINCTRL |
| select SOC_BUS |
| help |
| diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig |
| index 59aa3ea8ccaf..2c726b4f9356 100644 |
| --- a/arch/arm/mach-prima2/Kconfig |
| +++ b/arch/arm/mach-prima2/Kconfig |
| @@ -2,7 +2,6 @@ config ARCH_SIRF |
| bool "CSR SiRF" if ARCH_MULTI_V7 |
| select ARCH_REQUIRE_GPIOLIB |
| select GENERIC_IRQ_CHIP |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select NO_IOPORT |
| select PINCTRL |
| select PINCTRL_SIRF |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 76e450aceb46..1ebf839fa2b8 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -8,7 +8,6 @@ config ARCH_SHMOBILE_MULTI |
| select HAVE_ARM_SCU if SMP |
| select HAVE_ARM_TWD if SMP |
| select ARM_GIC |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select MIGHT_HAVE_PCI |
| select NO_IOPORT |
| select PINCTRL |
| diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig |
| index 601b8d831a56..5c57262b97e9 100644 |
| --- a/arch/arm/mach-spear/Kconfig |
| +++ b/arch/arm/mach-spear/Kconfig |
| @@ -19,7 +19,6 @@ config ARCH_SPEAR13XX |
| select GPIO_SPEAR_SPICS |
| select HAVE_ARM_SCU if SMP |
| select HAVE_ARM_TWD if SMP |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select PINCTRL |
| help |
| Supports for ARM's SPEAR13XX family |
| diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig |
| index c3fdceee4ecb..d2c13ba1190b 100644 |
| --- a/arch/arm/mach-sti/Kconfig |
| +++ b/arch/arm/mach-sti/Kconfig |
| @@ -5,7 +5,6 @@ menuconfig ARCH_STI |
| select PINCTRL |
| select PINCTRL_ST |
| select MFD_SYSCON |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select HAVE_ARM_SCU if SMP |
| select ARCH_REQUIRE_GPIOLIB |
| select ARM_ERRATA_754322 |
| diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig |
| index d58022939d5d..92d660f9610f 100644 |
| --- a/arch/arm/mach-tegra/Kconfig |
| +++ b/arch/arm/mach-tegra/Kconfig |
| @@ -7,7 +7,6 @@ config ARCH_TEGRA |
| select CLKSRC_MMIO |
| select HAVE_ARM_SCU if SMP |
| select HAVE_ARM_TWD if SMP |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select MIGHT_HAVE_PCI |
| select PINCTRL |
| select ARCH_HAS_RESET_CONTROLLER |
| diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig |
| index 731b9197e0e3..8052bd52450d 100644 |
| --- a/arch/arm/mach-ux500/Kconfig |
| +++ b/arch/arm/mach-ux500/Kconfig |
| @@ -13,7 +13,6 @@ config ARCH_U8500 |
| select CLKSRC_NOMADIK_MTU |
| select HAVE_ARM_SCU if SMP |
| select HAVE_ARM_TWD if SMP |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select PINCTRL |
| select PINCTRL_ABX500 |
| select PINCTRL_NOMADIK |
| diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig |
| index 6cbddb825fee..80b4be36f10a 100644 |
| --- a/arch/arm/mach-vexpress/Kconfig |
| +++ b/arch/arm/mach-vexpress/Kconfig |
| @@ -10,7 +10,6 @@ config ARCH_VEXPRESS |
| select HAVE_ARM_TWD if SMP |
| select HAVE_PATA_PLATFORM |
| select ICST |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select NO_IOPORT |
| select PLAT_VERSATILE |
| select PLAT_VERSATILE_CLCD |
| diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig |
| index 70e247dd1f08..105d39b72a25 100644 |
| --- a/arch/arm/mach-zynq/Kconfig |
| +++ b/arch/arm/mach-zynq/Kconfig |
| @@ -5,7 +5,6 @@ config ARCH_ZYNQ |
| select HAVE_ARM_SCU if SMP |
| select HAVE_ARM_TWD if SMP |
| select ICST |
| - select MIGHT_HAVE_CACHE_L2X0 |
| select CADENCE_TTC_TIMER |
| select ARM_GLOBAL_TIMER |
| help |
| -- |
| 2.1.2 |
| |
