diff options
Diffstat (limited to 'arch/arm/mach-spear/Kconfig')
-rw-r--r-- | arch/arm/mach-spear/Kconfig | 9 |
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 | ||
5 | menuconfig PLAT_SPEAR | 5 | menuconfig 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 | ||
14 | config ARCH_SPEAR13XX | 13 | config 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 | ||
45 | config ARCH_SPEAR3XX | 44 | config 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 | ||
76 | config ARCH_SPEAR6XX | 75 | config 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 | ||
90 | config ARCH_SPEAR_AUTO | 89 | config 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 | ||