[PATCH 01/16] ARM: OMAP: select SoC variant from boards

[Sascha Hauer]

To be able to compile multiple SoC types later.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/mach-omap/Kconfig | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index b2eec30..79e75d8 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -22,11 +22,8 @@ menu "OMAP Features"
 config MACH_OMAP
 	bool
 
-choice
-	prompt "Select OMAP Variant"
-
 config ARCH_OMAP3
-	bool "OMAP3"
+	bool
 	select CPU_V7
 	select GENERIC_GPIO
 	select OMAP_CLOCK_SOURCE_S32K
@@ -34,7 +31,7 @@ config ARCH_OMAP3
 	  Say Y here if you are using Texas Instrument's OMAP343x based platform
 
 config ARCH_OMAP4
-	bool "OMAP4"
+	bool
 	select CPU_V7
 	select GENERIC_GPIO
 	select OMAP_CLOCK_SOURCE_S32K
@@ -42,15 +39,13 @@ config ARCH_OMAP4
 	  Say Y here if you are using Texas Instrument's OMAP4 based platform
 
 config ARCH_AM33XX
-	bool "AM33xx"
+	bool
 	select CPU_V7
 	select GENERIC_GPIO
 	select OMAP_CLOCK_SOURCE_DMTIMER0
 	help
 	  Say Y here if you are using Texas Instrument's AM33xx based platform
 
-endchoice
-
 # Blind enable all possible clocks.. think twice before you do this.
 config OMAP_CLOCK_SOURCE_S32K
 	bool
@@ -124,65 +119,65 @@ choice
 
 config MACH_OMAP343xSDP
 	bool "Texas Instrument's SDP343x"
-	depends on ARCH_OMAP3
+	select ARCH_OMAP3
 	help
 	  Say Y here if you are using SDP343x platform
 
 config MACH_BEAGLE
 	bool "Texas Instrument's Beagle Board"
 	select HAVE_DEFAULT_ENVIRONMENT_NEW
-	depends on ARCH_OMAP3
+	select ARCH_OMAP3
 	help
 	  Say Y here if you are using Beagle Board
 
 config MACH_BEAGLEBONE
 	bool "Texas Instrument's Beagle Bone"
-	depends on ARCH_AM33XX
+	select ARCH_AM33XX
 	help
 	  Say Y here if you are using Beagle Bone
 
 config MACH_OMAP3EVM
 	bool "Texas Instrument's OMAP3 EVM"
-	depends on ARCH_OMAP3
+	select ARCH_OMAP3
 	help
 	  Say Y here if you are using OMAP3EVM
 
 config MACH_PANDA
 	bool "Texas Instrument's Panda Board"
 	select HAVE_DEFAULT_ENVIRONMENT_NEW
-	depends on ARCH_OMAP4
+	select ARCH_OMAP4
 	help
 	  Say Y here if you are using OMAP4 Panda board
 
 config MACH_ARCHOSG9
 	bool "Archos G9 tablets"
-	depends on ARCH_OMAP4
+	select ARCH_OMAP4
 	help
 	  Say Y here if you are using OMAP4-based Archos G9 tablet
 
 config MACH_PCM049
 	bool "Phytec phyCORE pcm049"
-	depends on ARCH_OMAP4
+	select ARCH_OMAP4
 	help
 	  Say Y here if you are using Phytecs phyCORE pcm049 board
 	  based on OMAP4
 
 config MACH_PCAAL1
 	bool "Phytec phyCARD-A-L1"
-	depends on ARCH_OMAP3
+	select ARCH_OMAP3
 	help
 	  Say Y here if you are using a phyCARD-A-L1 PCA-A-L1
 
 config MACH_PCAAXL2
 	bool "Phytec phyCARD XL2"
-	depends on ARCH_OMAP4
+	select ARCH_OMAP4
 	help
 	  Say Y here if you are using a phyCARD-A-XL1 PCA-A-XL1
 
 config MACH_PCM051
 	bool "Phytec phyCORE pcm051"
 	select HAVE_DEFAULT_ENVIRONMENT_NEW
-	depends on ARCH_AM33XX
+	select ARCH_AM33XX
 	help
 	  Say Y here if you are using Phytecs phyCORE pcm051 board
 
-- 
1.8.4.2