diff options
author | Rob Herring <robh@kernel.org> | 2014-01-31 16:36:10 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-02-19 17:44:00 -0500 |
commit | 9352b05b6e4ef1aae53744cbd0adc0491fae5be0 (patch) | |
tree | c8fb7fb3e285cfca12eb8ecdcf749f51c8660a6b | |
parent | 90bc8ac77dc85d2184da3d5280215b33253adffc (diff) |
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>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-cns3xxx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-prima2/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-spear/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-sti/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-zynq/Kconfig | 1 |
11 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a1f36e739fc9..7560be4cce92 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -921,6 +921,7 @@ config ARCH_MULTI_V7 | |||
921 | 921 | ||
922 | config ARCH_MULTI_V6_V7 | 922 | config ARCH_MULTI_V6_V7 |
923 | bool | 923 | bool |
924 | select MIGHT_HAVE_CACHE_L2X0 | ||
924 | 925 | ||
925 | config ARCH_MULTI_CPU_AUTO | 926 | config ARCH_MULTI_CPU_AUTO |
926 | def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) | 927 | 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 | |||
2 | bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 | 2 | bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 |
3 | select ARM_GIC | 3 | select ARM_GIC |
4 | select CPU_V6K | 4 | select CPU_V6K |
5 | select MIGHT_HAVE_CACHE_L2X0 | ||
6 | select MIGHT_HAVE_PCI | 5 | select MIGHT_HAVE_PCI |
7 | select PCI_DOMAINS if PCI | 6 | select PCI_DOMAINS if PCI |
8 | help | 7 | 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 | |||
5 | select CLKSRC_MMIO | 5 | select CLKSRC_MMIO |
6 | select GENERIC_ALLOCATOR | 6 | select GENERIC_ALLOCATOR |
7 | select GENERIC_IRQ_CHIP | 7 | select GENERIC_IRQ_CHIP |
8 | select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 | ||
9 | select PINCTRL | 8 | select PINCTRL |
10 | select SOC_BUS | 9 | select SOC_BUS |
11 | help | 10 | 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 | |||
2 | bool "CSR SiRF" if ARCH_MULTI_V7 | 2 | bool "CSR SiRF" if ARCH_MULTI_V7 |
3 | select ARCH_REQUIRE_GPIOLIB | 3 | select ARCH_REQUIRE_GPIOLIB |
4 | select GENERIC_IRQ_CHIP | 4 | select GENERIC_IRQ_CHIP |
5 | select MIGHT_HAVE_CACHE_L2X0 | ||
6 | select NO_IOPORT | 5 | select NO_IOPORT |
7 | select PINCTRL | 6 | select PINCTRL |
8 | select PINCTRL_SIRF | 7 | select PINCTRL_SIRF |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 99f181d760d6..8a685edf3bbc 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -8,7 +8,6 @@ config ARCH_SHMOBILE_MULTI | |||
8 | select HAVE_ARM_SCU if SMP | 8 | select HAVE_ARM_SCU if SMP |
9 | select HAVE_ARM_TWD if SMP | 9 | select HAVE_ARM_TWD if SMP |
10 | select ARM_GIC | 10 | select ARM_GIC |
11 | select MIGHT_HAVE_CACHE_L2X0 | ||
12 | select MIGHT_HAVE_PCI | 11 | select MIGHT_HAVE_PCI |
13 | select NO_IOPORT | 12 | select NO_IOPORT |
14 | select PINCTRL | 13 | 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 | |||
19 | select GPIO_SPEAR_SPICS | 19 | select GPIO_SPEAR_SPICS |
20 | select HAVE_ARM_SCU if SMP | 20 | select HAVE_ARM_SCU if SMP |
21 | select HAVE_ARM_TWD if SMP | 21 | select HAVE_ARM_TWD if SMP |
22 | select MIGHT_HAVE_CACHE_L2X0 | ||
23 | select PINCTRL | 22 | select PINCTRL |
24 | help | 23 | help |
25 | Supports for ARM's SPEAR13XX family | 24 | 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 | |||
5 | select PINCTRL | 5 | select PINCTRL |
6 | select PINCTRL_ST | 6 | select PINCTRL_ST |
7 | select MFD_SYSCON | 7 | select MFD_SYSCON |
8 | select MIGHT_HAVE_CACHE_L2X0 | ||
9 | select HAVE_ARM_SCU if SMP | 8 | select HAVE_ARM_SCU if SMP |
10 | select ARCH_REQUIRE_GPIOLIB | 9 | select ARCH_REQUIRE_GPIOLIB |
11 | select ARM_ERRATA_754322 | 10 | select ARM_ERRATA_754322 |
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index e59673999a98..f61cd5b9f103 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -7,7 +7,6 @@ config ARCH_TEGRA | |||
7 | select CLKSRC_MMIO | 7 | select CLKSRC_MMIO |
8 | select HAVE_ARM_SCU if SMP | 8 | select HAVE_ARM_SCU if SMP |
9 | select HAVE_ARM_TWD if SMP | 9 | select HAVE_ARM_TWD if SMP |
10 | select MIGHT_HAVE_CACHE_L2X0 | ||
11 | select MIGHT_HAVE_PCI | 10 | select MIGHT_HAVE_PCI |
12 | select PINCTRL | 11 | select PINCTRL |
13 | select ARCH_HAS_RESET_CONTROLLER | 12 | 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 | |||
13 | select CLKSRC_NOMADIK_MTU | 13 | select CLKSRC_NOMADIK_MTU |
14 | select HAVE_ARM_SCU if SMP | 14 | select HAVE_ARM_SCU if SMP |
15 | select HAVE_ARM_TWD if SMP | 15 | select HAVE_ARM_TWD if SMP |
16 | select MIGHT_HAVE_CACHE_L2X0 | ||
17 | select PINCTRL | 16 | select PINCTRL |
18 | select PINCTRL_ABX500 | 17 | select PINCTRL_ABX500 |
19 | select PINCTRL_NOMADIK | 18 | 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 | |||
10 | select HAVE_ARM_TWD if SMP | 10 | select HAVE_ARM_TWD if SMP |
11 | select HAVE_PATA_PLATFORM | 11 | select HAVE_PATA_PLATFORM |
12 | select ICST | 12 | select ICST |
13 | select MIGHT_HAVE_CACHE_L2X0 | ||
14 | select NO_IOPORT | 13 | select NO_IOPORT |
15 | select PLAT_VERSATILE | 14 | select PLAT_VERSATILE |
16 | select PLAT_VERSATILE_CLCD | 15 | 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 | |||
5 | select HAVE_ARM_SCU if SMP | 5 | select HAVE_ARM_SCU if SMP |
6 | select HAVE_ARM_TWD if SMP | 6 | select HAVE_ARM_TWD if SMP |
7 | select ICST | 7 | select ICST |
8 | select MIGHT_HAVE_CACHE_L2X0 | ||
9 | select CADENCE_TTC_TIMER | 8 | select CADENCE_TTC_TIMER |
10 | select ARM_GLOBAL_TIMER | 9 | select ARM_GLOBAL_TIMER |
11 | help | 10 | help |