aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/mach-exynos/Kconfig2
-rw-r--r--arch/arm/mach-highbank/Kconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig3
-rw-r--r--arch/arm/mach-msm/Kconfig7
-rw-r--r--arch/arm/mach-omap2/Kconfig2
-rw-r--r--arch/arm/mach-prima2/Kconfig1
-rw-r--r--arch/arm/mach-realview/Kconfig8
-rw-r--r--arch/arm/mach-spear/Kconfig2
-rw-r--r--arch/arm/mach-tegra/Kconfig2
-rw-r--r--arch/arm/mach-ux500/Kconfig2
-rw-r--r--arch/arm/mach-vexpress/Kconfig2
-rw-r--r--arch/arm/mach-zynq/Kconfig2
13 files changed, 30 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a6333e66b41..88b662d4618d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -637,6 +637,8 @@ config ARCH_SHMOBILE
637 bool "Renesas SH-Mobile / R-Mobile" 637 bool "Renesas SH-Mobile / R-Mobile"
638 select CLKDEV_LOOKUP 638 select CLKDEV_LOOKUP
639 select GENERIC_CLOCKEVENTS 639 select GENERIC_CLOCKEVENTS
640 select HAVE_ARM_SCU if SMP
641 select HAVE_ARM_TWD if LOCAL_TIMERS
640 select HAVE_CLK 642 select HAVE_CLK
641 select HAVE_MACH_CLKDEV 643 select HAVE_MACH_CLKDEV
642 select HAVE_SMP 644 select HAVE_SMP
@@ -1400,7 +1402,6 @@ config SMP
1400 depends on GENERIC_CLOCKEVENTS 1402 depends on GENERIC_CLOCKEVENTS
1401 depends on HAVE_SMP 1403 depends on HAVE_SMP
1402 depends on MMU 1404 depends on MMU
1403 select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
1404 select USE_GENERIC_SMP_HELPERS 1405 select USE_GENERIC_SMP_HELPERS
1405 help 1406 help
1406 This enables support for systems with more than one CPU. If you have 1407 This enables support for systems with more than one CPU. If you have
@@ -1525,7 +1526,6 @@ config LOCAL_TIMERS
1525 bool "Use local timer interrupts" 1526 bool "Use local timer interrupts"
1526 depends on SMP 1527 depends on SMP
1527 default y 1528 default y
1528 select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)
1529 help 1529 help
1530 Enable support for local timers on SMP platforms, rather then the 1530 Enable support for local timers on SMP platforms, rather then the
1531 legacy IPI broadcast method. Local timers allows the system 1531 legacy IPI broadcast method. Local timers allows the system
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 70f94c87479d..54cf73e7a791 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -14,6 +14,7 @@ menu "SAMSUNG EXYNOS SoCs Support"
14config ARCH_EXYNOS4 14config ARCH_EXYNOS4
15 bool "SAMSUNG EXYNOS4" 15 bool "SAMSUNG EXYNOS4"
16 default y 16 default y
17 select HAVE_ARM_SCU if SMP
17 select HAVE_SMP 18 select HAVE_SMP
18 select MIGHT_HAVE_CACHE_L2X0 19 select MIGHT_HAVE_CACHE_L2X0
19 help 20 help
@@ -21,6 +22,7 @@ config ARCH_EXYNOS4
21 22
22config ARCH_EXYNOS5 23config ARCH_EXYNOS5
23 bool "SAMSUNG EXYNOS5" 24 bool "SAMSUNG EXYNOS5"
25 select HAVE_ARM_SCU if SMP
24 select HAVE_SMP 26 select HAVE_SMP
25 help 27 help
26 Samsung EXYNOS5 (Cortex-A15) SoC based systems 28 Samsung EXYNOS5 (Cortex-A15) SoC based systems
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 44b12f9c1584..cd9fcb1cd7ab 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -12,6 +12,7 @@ config ARCH_HIGHBANK
12 select CPU_V7 12 select CPU_V7
13 select GENERIC_CLOCKEVENTS 13 select GENERIC_CLOCKEVENTS
14 select HAVE_ARM_SCU 14 select HAVE_ARM_SCU
15 select HAVE_ARM_TWD if LOCAL_TIMERS
15 select HAVE_SMP 16 select HAVE_SMP
16 select MAILBOX 17 select MAILBOX
17 select PL320_MBOX 18 select PL320_MBOX
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4c9c6f9d2c55..2cc0dbd0d6de 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -811,7 +811,8 @@ config SOC_IMX6Q
811 select ARM_GIC 811 select ARM_GIC
812 select COMMON_CLK 812 select COMMON_CLK
813 select CPU_V7 813 select CPU_V7
814 select HAVE_ARM_SCU 814 select HAVE_ARM_SCU if SMP
815 select HAVE_ARM_TWD if LOCAL_TIMERS
815 select HAVE_CAN_FLEXCAN if CAN 816 select HAVE_CAN_FLEXCAN if CAN
816 select HAVE_IMX_GPC 817 select HAVE_IMX_GPC
817 select HAVE_IMX_MMDC 818 select HAVE_IMX_MMDC
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index b61908594b47..fceb093b9494 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -44,10 +44,10 @@ endchoice
44 44
45config ARCH_MSM8X60 45config ARCH_MSM8X60
46 bool "MSM8X60" 46 bool "MSM8X60"
47 select ARCH_MSM_SCORPIONMP
48 select ARM_GIC 47 select ARM_GIC
49 select CPU_V7 48 select CPU_V7
50 select GPIO_MSM_V2 49 select GPIO_MSM_V2
50 select HAVE_SMP
51 select MSM_GPIOMUX 51 select MSM_GPIOMUX
52 select MSM_SCM if SMP 52 select MSM_SCM if SMP
53 select MSM_V2_TLMM 53 select MSM_V2_TLMM
@@ -55,9 +55,9 @@ config ARCH_MSM8X60
55 55
56config ARCH_MSM8960 56config ARCH_MSM8960
57 bool "MSM8960" 57 bool "MSM8960"
58 select ARCH_MSM_SCORPIONMP
59 select ARM_GIC 58 select ARM_GIC
60 select CPU_V7 59 select CPU_V7
60 select HAVE_SMP
61 select MSM_GPIOMUX 61 select MSM_GPIOMUX
62 select MSM_SCM if SMP 62 select MSM_SCM if SMP
63 select MSM_V2_TLMM 63 select MSM_V2_TLMM
@@ -68,9 +68,6 @@ config MSM_HAS_DEBUG_UART_HS
68 68
69config MSM_SOC_REV_A 69config MSM_SOC_REV_A
70 bool 70 bool
71config ARCH_MSM_SCORPIONMP
72 bool
73 select HAVE_SMP
74 71
75config ARCH_MSM_ARM11 72config ARCH_MSM_ARM11
76 bool 73 bool
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 8111cd9ff3e5..e6724a73a514 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -87,6 +87,8 @@ config ARCH_OMAP4
87 select ARM_GIC 87 select ARM_GIC
88 select CACHE_L2X0 88 select CACHE_L2X0
89 select CPU_V7 89 select CPU_V7
90 select HAVE_ARM_SCU if SMP
91 select HAVE_ARM_TWD if LOCAL_TIMERS
90 select HAVE_SMP 92 select HAVE_SMP
91 select LOCAL_TIMERS if SMP 93 select LOCAL_TIMERS if SMP
92 select OMAP_INTERCONNECT 94 select OMAP_INTERCONNECT
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 587c0bd70434..80ca974b2f82 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -36,6 +36,7 @@ config ARCH_MARCO
36 default y 36 default y
37 select ARM_GIC 37 select ARM_GIC
38 select CPU_V7 38 select CPU_V7
39 select HAVE_ARM_SCU if SMP
39 select HAVE_SMP 40 select HAVE_SMP
40 select SMP_ON_UP 41 select SMP_ON_UP
41 help 42 help
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 14c1d47e1abf..d210c0f9c2c4 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -12,6 +12,8 @@ config REALVIEW_EB_A9MP
12 bool "Support Multicore Cortex-A9 Tile" 12 bool "Support Multicore Cortex-A9 Tile"
13 depends on MACH_REALVIEW_EB 13 depends on MACH_REALVIEW_EB
14 select CPU_V7 14 select CPU_V7
15 select HAVE_ARM_SCU if SMP
16 select HAVE_ARM_TWD if LOCAL_TIMERS
15 select HAVE_SMP 17 select HAVE_SMP
16 select MIGHT_HAVE_CACHE_L2X0 18 select MIGHT_HAVE_CACHE_L2X0
17 help 19 help
@@ -23,6 +25,8 @@ config REALVIEW_EB_ARM11MP
23 depends on MACH_REALVIEW_EB 25 depends on MACH_REALVIEW_EB
24 select ARCH_HAS_BARRIERS if SMP 26 select ARCH_HAS_BARRIERS if SMP
25 select CPU_V6K 27 select CPU_V6K
28 select HAVE_ARM_SCU if SMP
29 select HAVE_ARM_TWD if LOCAL_TIMERS
26 select HAVE_SMP 30 select HAVE_SMP
27 select MIGHT_HAVE_CACHE_L2X0 31 select MIGHT_HAVE_CACHE_L2X0
28 help 32 help
@@ -43,6 +47,8 @@ config MACH_REALVIEW_PB11MP
43 select ARCH_HAS_BARRIERS if SMP 47 select ARCH_HAS_BARRIERS if SMP
44 select ARM_GIC 48 select ARM_GIC
45 select CPU_V6K 49 select CPU_V6K
50 select HAVE_ARM_SCU if SMP
51 select HAVE_ARM_TWD if LOCAL_TIMERS
46 select HAVE_PATA_PLATFORM 52 select HAVE_PATA_PLATFORM
47 select HAVE_SMP 53 select HAVE_SMP
48 select MIGHT_HAVE_CACHE_L2X0 54 select MIGHT_HAVE_CACHE_L2X0
@@ -85,6 +91,8 @@ config MACH_REALVIEW_PBX
85 bool "Support RealView(R) Platform Baseboard Explore" 91 bool "Support RealView(R) Platform Baseboard Explore"
86 select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET 92 select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
87 select ARM_GIC 93 select ARM_GIC
94 select HAVE_ARM_SCU if SMP
95 select HAVE_ARM_TWD if LOCAL_TIMERS
88 select HAVE_PATA_PLATFORM 96 select HAVE_PATA_PLATFORM
89 select HAVE_SMP 97 select HAVE_SMP
90 select MIGHT_HAVE_CACHE_L2X0 98 select MIGHT_HAVE_CACHE_L2X0
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 4c52ee2b77dc..716522af1a23 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -22,6 +22,8 @@ config ARCH_SPEAR13XX
22 select ARM_GIC 22 select ARM_GIC
23 select CPU_V7 23 select CPU_V7
24 select GPIO_SPEAR_SPICS 24 select GPIO_SPEAR_SPICS
25 select HAVE_ARM_SCU if SMP
26 select HAVE_ARM_TWD if LOCAL_TIMERS
25 select HAVE_SMP 27 select HAVE_SMP
26 select MIGHT_HAVE_CACHE_L2X0 28 select MIGHT_HAVE_CACHE_L2X0
27 select PINCTRL 29 select PINCTRL
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index df99ee93030a..597e76b30e99 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -7,6 +7,8 @@ config ARCH_TEGRA
7 select CLKSRC_OF 7 select CLKSRC_OF
8 select COMMON_CLK 8 select COMMON_CLK
9 select GENERIC_CLOCKEVENTS 9 select GENERIC_CLOCKEVENTS
10 select HAVE_ARM_SCU if SMP
11 select HAVE_ARM_TWD if LOCAL_TIMERS
10 select HAVE_CLK 12 select HAVE_CLK
11 select HAVE_SMP 13 select HAVE_SMP
12 select MIGHT_HAVE_CACHE_L2X0 14 select MIGHT_HAVE_CACHE_L2X0
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index eeea3bf4dffb..f66d7deae46d 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -7,6 +7,8 @@ config ARCH_U8500
7 select CLKDEV_LOOKUP 7 select CLKDEV_LOOKUP
8 select CPU_V7 8 select CPU_V7
9 select GENERIC_CLOCKEVENTS 9 select GENERIC_CLOCKEVENTS
10 select HAVE_ARM_SCU if SMP
11 select HAVE_ARM_TWD if LOCAL_TIMERS
10 select HAVE_SMP 12 select HAVE_SMP
11 select MIGHT_HAVE_CACHE_L2X0 13 select MIGHT_HAVE_CACHE_L2X0
12 help 14 help
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 52d315b792c8..5e3a2d3fca29 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -9,6 +9,8 @@ config ARCH_VEXPRESS
9 select COMMON_CLK_VERSATILE 9 select COMMON_CLK_VERSATILE
10 select CPU_V7 10 select CPU_V7
11 select GENERIC_CLOCKEVENTS 11 select GENERIC_CLOCKEVENTS
12 select HAVE_ARM_SCU if SMP
13 select HAVE_ARM_TWD if LOCAL_TIMERS
12 select HAVE_CLK 14 select HAVE_CLK
13 select HAVE_PATA_PLATFORM 15 select HAVE_PATA_PLATFORM
14 select HAVE_SMP 16 select HAVE_SMP
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index adb6c0ea0e53..138b5891f4ef 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -5,6 +5,8 @@ config ARCH_ZYNQ
5 select COMMON_CLK 5 select COMMON_CLK
6 select CPU_V7 6 select CPU_V7
7 select GENERIC_CLOCKEVENTS 7 select GENERIC_CLOCKEVENTS
8 select HAVE_ARM_SCU if SMP
9 select HAVE_ARM_TWD if LOCAL_TIMERS
8 select ICST 10 select ICST
9 select MIGHT_HAVE_CACHE_L2X0 11 select MIGHT_HAVE_CACHE_L2X0
10 select USE_OF 12 select USE_OF
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-18 08:53:17 -0500