aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-01-31 16:32:02 -0500
committerRob Herring <robh@kernel.org>2014-02-19 17:43:27 -0500
commit90bc8ac77dc85d2184da3d5280215b33253adffc (patch)
treeaf798f11439d8944f750a4b9be23cd64833e26e9 /arch/arm
parentddb902cc34593ecb88c368f6e15db3cf829c56fe (diff)
ARM: select HAVE_SMP for V7 multi-platform
All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for 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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-berlin/Kconfig1
-rw-r--r--arch/arm/mach-highbank/Kconfig1
-rw-r--r--arch/arm/mach-hisi/Kconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig1
-rw-r--r--arch/arm/mach-keystone/Kconfig1
-rw-r--r--arch/arm/mach-mvebu/Kconfig1
-rw-r--r--arch/arm/mach-omap2/Kconfig2
-rw-r--r--arch/arm/mach-prima2/Kconfig1
-rw-r--r--arch/arm/mach-rockchip/Kconfig1
-rw-r--r--arch/arm/mach-shmobile/Kconfig1
-rw-r--r--arch/arm/mach-socfpga/Kconfig1
-rw-r--r--arch/arm/mach-spear/Kconfig1
-rw-r--r--arch/arm/mach-sti/Kconfig1
-rw-r--r--arch/arm/mach-sunxi/Kconfig1
-rw-r--r--arch/arm/mach-tegra/Kconfig1
-rw-r--r--arch/arm/mach-ux500/Kconfig1
-rw-r--r--arch/arm/mach-vexpress/Kconfig1
-rw-r--r--arch/arm/mach-zynq/Kconfig1
19 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 72d55719efc5..a1f36e739fc9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -917,6 +917,7 @@ config ARCH_MULTI_V7
917 default y 917 default y
918 select ARCH_MULTI_V6_V7 918 select ARCH_MULTI_V6_V7
919 select CPU_V7 919 select CPU_V7
920 select HAVE_SMP
920 921
921config ARCH_MULTI_V6_V7 922config ARCH_MULTI_V6_V7
922 bool 923 bool
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index b346f598a595..b0cb0722acd2 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -14,7 +14,6 @@ config MACH_BERLIN_BG2
14 select CACHE_L2X0 14 select CACHE_L2X0
15 select CPU_PJ4B 15 select CPU_PJ4B
16 select HAVE_ARM_TWD if SMP 16 select HAVE_ARM_TWD if SMP
17 select HAVE_SMP
18 17
19config MACH_BERLIN_BG2CD 18config MACH_BERLIN_BG2CD
20 bool "Marvell Armada 1500-mini (BG2CD)" 19 bool "Marvell Armada 1500-mini (BG2CD)"
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 59274a7fd7c5..830b76e70250 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -15,7 +15,6 @@ config ARCH_HIGHBANK
15 select CACHE_L2X0 15 select CACHE_L2X0
16 select HAVE_ARM_SCU 16 select HAVE_ARM_SCU
17 select HAVE_ARM_TWD if SMP 17 select HAVE_ARM_TWD if SMP
18 select HAVE_SMP
19 select MAILBOX 18 select MAILBOX
20 select PL320_MBOX 19 select PL320_MBOX
21 select ZONE_DMA if ARM_LPAE 20 select ZONE_DMA if ARM_LPAE
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 95492d715166..9d0a87b025e3 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -6,7 +6,6 @@ config ARCH_HI3xxx
6 select CACHE_L2X0 6 select CACHE_L2X0
7 select HAVE_ARM_SCU 7 select HAVE_ARM_SCU
8 select HAVE_ARM_TWD if SMP 8 select HAVE_ARM_TWD if SMP
9 select HAVE_SMP
10 select PINCTRL 9 select PINCTRL
11 select PINCTRL_SINGLE 10 select PINCTRL_SINGLE
12 help 11 help
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3dd2c601fea2..1a6a843aad66 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -791,7 +791,6 @@ config SOC_IMX6Q
791 select HAVE_IMX_GPC 791 select HAVE_IMX_GPC
792 select HAVE_IMX_MMDC 792 select HAVE_IMX_MMDC
793 select HAVE_IMX_SRC 793 select HAVE_IMX_SRC
794 select HAVE_SMP
795 select MFD_SYSCON 794 select MFD_SYSCON
796 select MIGHT_HAVE_PCI 795 select MIGHT_HAVE_PCI
797 select PCI_DOMAINS if PCI 796 select PCI_DOMAINS if PCI
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 00ed74473eaf..f50bc936cb84 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -3,7 +3,6 @@ config ARCH_KEYSTONE
3 depends on ARCH_MULTI_V7 3 depends on ARCH_MULTI_V7
4 select ARM_GIC 4 select ARM_GIC
5 select HAVE_ARM_ARCH_TIMER 5 select HAVE_ARM_ARCH_TIMER
6 select HAVE_SMP
7 select CLKSRC_MMIO 6 select CLKSRC_MMIO
8 select ARM_ERRATA_798181 if SMP 7 select ARM_ERRATA_798181 if SMP
9 select COMMON_CLK_KEYSTONE 8 select COMMON_CLK_KEYSTONE
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index d581e846d922..875a35263dc3 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -19,7 +19,6 @@ menu "Marvell SOC with device tree"
19config MACH_ARMADA_370_XP 19config MACH_ARMADA_370_XP
20 bool 20 bool
21 select ARMADA_370_XP_TIMER 21 select ARMADA_370_XP_TIMER
22 select HAVE_SMP
23 select CACHE_L2X0 22 select CACHE_L2X0
24 select CPU_PJ4B 23 select CPU_PJ4B
25 24
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index d4eb5e97406b..922cbd8e3519 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -32,7 +32,6 @@ config ARCH_OMAP4
32 select CACHE_L2X0 32 select CACHE_L2X0
33 select HAVE_ARM_SCU if SMP 33 select HAVE_ARM_SCU if SMP
34 select HAVE_ARM_TWD if SMP 34 select HAVE_ARM_TWD if SMP
35 select HAVE_SMP
36 select OMAP_INTERCONNECT 35 select OMAP_INTERCONNECT
37 select PL310_ERRATA_588369 36 select PL310_ERRATA_588369
38 select PL310_ERRATA_727915 37 select PL310_ERRATA_727915
@@ -50,7 +49,6 @@ config SOC_OMAP5
50 select ARM_GIC 49 select ARM_GIC
51 select HAVE_ARM_SCU if SMP 50 select HAVE_ARM_SCU if SMP
52 select HAVE_ARM_TWD if SMP 51 select HAVE_ARM_TWD if SMP
53 select HAVE_SMP
54 select HAVE_ARM_ARCH_TIMER 52 select HAVE_ARM_ARCH_TIMER
55 select ARM_ERRATA_798181 if SMP 53 select ARM_ERRATA_798181 if SMP
56 54
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 16c2d90762f0..59aa3ea8ccaf 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -33,7 +33,6 @@ config ARCH_MARCO
33 default y 33 default y
34 select ARM_GIC 34 select ARM_GIC
35 select HAVE_ARM_SCU if SMP 35 select HAVE_ARM_SCU if SMP
36 select HAVE_SMP
37 select SMP_ON_UP if SMP 36 select SMP_ON_UP if SMP
38 help 37 help
39 Support for CSR SiRFSoC ARM Cortex A9 Platform 38 Support for CSR SiRFSoC ARM Cortex A9 Platform
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 2a695bc977b2..6b2f58645a73 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -6,7 +6,6 @@ config ARCH_ROCKCHIP
6 select ARM_GIC 6 select ARM_GIC
7 select CACHE_L2X0 7 select CACHE_L2X0
8 select HAVE_ARM_TWD if SMP 8 select HAVE_ARM_TWD if SMP
9 select HAVE_SMP
10 select DW_APB_TIMER_OF 9 select DW_APB_TIMER_OF
11 select ARM_GLOBAL_TIMER 10 select ARM_GLOBAL_TIMER
12 select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK 11 select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 6f24e9e7d230..99f181d760d6 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -7,7 +7,6 @@ config ARCH_SHMOBILE_MULTI
7 select ARCH_SHMOBILE 7 select ARCH_SHMOBILE
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 HAVE_SMP
11 select ARM_GIC 10 select ARM_GIC
12 select MIGHT_HAVE_CACHE_L2X0 11 select MIGHT_HAVE_CACHE_L2X0
13 select MIGHT_HAVE_PCI 12 select MIGHT_HAVE_PCI
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 224913770509..b5f8d75d51a0 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -7,5 +7,4 @@ config ARCH_SOCFPGA
7 select GPIO_PL061 if GPIOLIB 7 select GPIO_PL061 if GPIOLIB
8 select HAVE_ARM_SCU 8 select HAVE_ARM_SCU
9 select HAVE_ARM_TWD if SMP 9 select HAVE_ARM_TWD if SMP
10 select HAVE_SMP
11 select MFD_SYSCON 10 select MFD_SYSCON
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index a7a28eadd93c..601b8d831a56 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 HAVE_SMP
23 select MIGHT_HAVE_CACHE_L2X0 22 select MIGHT_HAVE_CACHE_L2X0
24 select PINCTRL 23 select PINCTRL
25 help 24 help
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 9c6dda85d587..c3fdceee4ecb 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -6,7 +6,6 @@ menuconfig ARCH_STI
6 select PINCTRL_ST 6 select PINCTRL_ST
7 select MFD_SYSCON 7 select MFD_SYSCON
8 select MIGHT_HAVE_CACHE_L2X0 8 select MIGHT_HAVE_CACHE_L2X0
9 select HAVE_SMP
10 select HAVE_ARM_SCU if SMP 9 select HAVE_ARM_SCU if SMP
11 select ARCH_REQUIRE_GPIOLIB 10 select ARCH_REQUIRE_GPIOLIB
12 select ARM_ERRATA_754322 11 select ARM_ERRATA_754322
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 201ef9b526fd..9de27cfa688f 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -6,7 +6,6 @@ config ARCH_SUNXI
6 select ARM_PSCI 6 select ARM_PSCI
7 select CLKSRC_MMIO 7 select CLKSRC_MMIO
8 select GENERIC_IRQ_CHIP 8 select GENERIC_IRQ_CHIP
9 select HAVE_SMP
10 select PINCTRL 9 select PINCTRL
11 select PINCTRL_SUNXI 10 select PINCTRL_SUNXI
12 select RESET_CONTROLLER 11 select RESET_CONTROLLER
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 5dc3e38a53b5..e59673999a98 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 HAVE_SMP
11 select MIGHT_HAVE_CACHE_L2X0 10 select MIGHT_HAVE_CACHE_L2X0
12 select MIGHT_HAVE_PCI 11 select MIGHT_HAVE_PCI
13 select PINCTRL 12 select PINCTRL
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5d71c825e9d5..731b9197e0e3 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 HAVE_SMP
17 select MIGHT_HAVE_CACHE_L2X0 16 select MIGHT_HAVE_CACHE_L2X0
18 select PINCTRL 17 select PINCTRL
19 select PINCTRL_ABX500 18 select PINCTRL_ABX500
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index fa2922292a58..6cbddb825fee 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -9,7 +9,6 @@ config ARCH_VEXPRESS
9 select HAVE_ARM_SCU if SMP 9 select HAVE_ARM_SCU if SMP
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 HAVE_SMP
13 select ICST 12 select ICST
14 select MIGHT_HAVE_CACHE_L2X0 13 select MIGHT_HAVE_CACHE_L2X0
15 select NO_IOPORT 14 select NO_IOPORT
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 85d180583402..70e247dd1f08 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -6,7 +6,6 @@ config ARCH_ZYNQ
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 8 select MIGHT_HAVE_CACHE_L2X0
9 select HAVE_SMP
10 select CADENCE_TTC_TIMER 9 select CADENCE_TTC_TIMER
11 select ARM_GLOBAL_TIMER 10 select ARM_GLOBAL_TIMER
12 help 11 help
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-25 04:39:03 -0400