aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2014-04-15 04:26:47 -0400
committerArnd Bergmann <arnd@arndb.de>2014-09-05 07:33:41 -0400
commit3b0b8ec99aadea710f3dece74c95523463c0087a (patch)
tree3a85818868404441956675bd27265a56b3c93bf4 /arch/arm/mach-spear
parent0a2e912d296201c476fe5d7ba6ac23a66325935f (diff)
ARM: spear: Remove references to PLAT_SPEAR_SINGLE
The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed. Reported-by: Martin Walch <walch.martin@web.de> Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Reviewed-by: Rajeev Kumar <rajeev-dlh.kumar@st.com> Cc: Rajeev Kumar <rajeev_kumar@mentor.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r--arch/arm/mach-spear/Kconfig9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 6fd4dc88160b..b6f4bda273b3 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -4,7 +4,6 @@
4 4
5menuconfig PLAT_SPEAR 5menuconfig PLAT_SPEAR
6 bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5 6 bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
7 default PLAT_SPEAR_SINGLE
8 select ARCH_REQUIRE_GPIOLIB 7 select ARCH_REQUIRE_GPIOLIB
9 select ARM_AMBA 8 select ARM_AMBA
10 select CLKSRC_MMIO 9 select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
13 12
14config ARCH_SPEAR13XX 13config ARCH_SPEAR13XX
15 bool "ST SPEAr13xx" 14 bool "ST SPEAr13xx"
16 depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE 15 depends on ARCH_MULTI_V7
17 select ARM_GIC 16 select ARM_GIC
18 select GPIO_SPEAR_SPICS 17 select GPIO_SPEAR_SPICS
19 select HAVE_ARM_SCU if SMP 18 select HAVE_ARM_SCU if SMP
@@ -44,7 +43,7 @@ endif #ARCH_SPEAR13XX
44 43
45config ARCH_SPEAR3XX 44config ARCH_SPEAR3XX
46 bool "ST SPEAr3xx" 45 bool "ST SPEAr3xx"
47 depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE 46 depends on ARCH_MULTI_V5
48 depends on !ARCH_SPEAR13XX 47 depends on !ARCH_SPEAR13XX
49 select ARM_VIC 48 select ARM_VIC
50 select PINCTRL 49 select PINCTRL
@@ -75,7 +74,7 @@ endif
75 74
76config ARCH_SPEAR6XX 75config ARCH_SPEAR6XX
77 bool "ST SPEAr6XX" 76 bool "ST SPEAr6XX"
78 depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE 77 depends on ARCH_MULTI_V5
79 depends on !ARCH_SPEAR13XX 78 depends on !ARCH_SPEAR13XX
80 select ARM_VIC 79 select ARM_VIC
81 help 80 help
@@ -88,7 +87,7 @@ config MACH_SPEAR600
88 Supports ST SPEAr600 boards configured via the device-tree 87 Supports ST SPEAr600 boards configured via the device-tree
89 88
90config ARCH_SPEAR_AUTO 89config ARCH_SPEAR_AUTO
91 def_bool PLAT_SPEAR_SINGLE 90 bool
92 depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX 91 depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
93 select ARCH_SPEAR3XX 92 select ARCH_SPEAR3XX
94 93