summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-20 17:37:58 +0000
committerArnd Bergmann <arnd@arndb.de>2012-05-14 17:48:27 +0200
commit74c437532b8b5db53509963ec38e8424c56ff6f4 (patch)
tree56795125546dc07b416b08d13255709c3dc07118 /arch
parent1b6c352149f13744b4fe4e5e5d04de0f939d1d42 (diff)
downloadlinux-74c437532b8b5db53509963ec38e8424c56ff6f4.tar.gz
ARM: spear6xx: remove board selection options
There are no board specific configurations that need user
intervention, so just make MACH_SPEAR600 the silent default
for ARCH_SPEAR6XX to prevent users from turning it off, which
would result in a build error.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-spear6xx/Kconfig18
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
index fbe298bd1d92..339f397dea70 100644
--- a/arch/arm/mach-spear6xx/Kconfig
+++ b/arch/arm/mach-spear6xx/Kconfig
@@ -2,21 +2,9 @@
 # SPEAr6XX Machine configuration file
 #
 
-if ARCH_SPEAR6XX
-
-menu "SPEAr6xx Implementations"
-config BOARD_SPEAR600_DT
-	bool "SPEAr600 generic board configured via device-tree"
-	select MACH_SPEAR600
+config MACH_SPEAR600
+	def_bool y
+	depends on ARCH_SPEAR6XX
 	select USE_OF
 	help
 	  Supports ST SPEAr600 boards configured via the device-tree
-
-endmenu
-
-config MACH_SPEAR600
-	bool "SPEAr600"
-	help
-	  Supports ST SPEAr600 Machine
-
-endif #ARCH_SPEAR6XX