s3c2443: rework platform main kconfig

Convert platform selection to CHOICE so only one platform can be
selected at a time.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>

2 files changed, 48 insertions, 46 deletions

diff --git a/arch/arm/mach-s3c2443/Kconfig b/arch/arm/mach-s3c2443/Kconfig
index 7e171ed62f6b..a37a84d65a13 100644
--- a/arch/arm/mach-s3c2443/Kconfig
+++ b/arch/arm/mach-s3c2443/Kconfig
@@ -20,6 +20,9 @@ config S3C2443_DMA
 
 menu "S3C2443 Machines"
 
+choice
+	prompt "S3C2443 Machines"
+
 config MACH_SMDK2443
 	bool "SMDK2443"
 	select CPU_S3C2443
@@ -28,27 +31,29 @@ config MACH_SMDK2443
 	  Say Y here if you are using an SMDK2443
 
 config MACH_CC9M2443JS
-        bool "ConnectCore 9M 2443 on a JSCC9M2443 Devboard"
-        select CPU_S3C2443
+	bool "ConnectCore 9M 2443 on a JSCC9M2443 Devboard"
+	select CPU_S3C2443
 	select MACH_CC9M2443JS_PM if PM
-        help
-          Say Y here if you are using the ConnectCore 9M 2443 module
-          on a JSCC9M2443 Development Board
+	help
+	  Say Y here if you are using the ConnectCore 9M 2443 module
+	  on a JSCC9M2443 Development Board
 
 config MACH_CCW9M2443JS
-        bool "ConnectCore Wi-9M 2443 on a JSCC9M2443 Devboard"
-        select CPU_S3C2443
+	bool "ConnectCore Wi-9M 2443 on a JSCC9M2443 Devboard"
+	select CPU_S3C2443
 	select MACH_CC9M2443JS_PM if PM
-        help
-          Say Y here if you are using the ConnectCore Wi-9M 2443 module
-          on a JSCC9M2443 Development Board
+	help
+	  Say Y here if you are using the ConnectCore Wi-9M 2443 module
+	  on a JSCC9M2443 Development Board
+
+endchoice
 
 config MACH_CC9M2443JS_GPIOLIB
-        bool "Enables the machine's GPIO-Lib"
-        depends on (MACH_CC9M2443JS || MACH_CCW9M2443JS)
-        help
-          Say Y to enable the GPIO-Lib support for the ConnectCore 9M 2443 module
-          on a JSCC9M2443 Development Board
+	bool "Enables the machine's GPIO-Lib"
+	depends on (MACH_CC9M2443JS || MACH_CCW9M2443JS)
+	help
+	  Say Y to enable the GPIO-Lib support for the ConnectCore 9M 2443 module
+	  on a JSCC9M2443 Development Board
 
 config MACH_CC9M2443JS_PM
 	bool
@@ -63,46 +68,45 @@ config MACH_CC9M2443JS_USB
 	help
 	  Enable the overload protection for the ConnectCore 9M 2443 module on a
 	  JSCC9M2443 Development Board.
-  
+
 config S3C2443_USB_PHY
-        bool "Enable the USB PHY for the S3C2443"
-        depends on CPU_S3C2443
-        depends on USB_SUPPORT
-        default y
-        help
-          This option enables the USB PHY on the S3C2443.
-
-          IMPORTANT: After enabling/disabling the functionality of the USB PHY
-          please verify that the UDC controller is correctly configured. When
-          disabling the S3C2443-UDC the configuration menu selects automatically
-          another one. The reconfiguration can be done under:
-
-		  Device Drivers > USB support > USB Gadget Support 
-	  
+	bool "Enable the USB PHY for the S3C2443"
+	depends on CPU_S3C2443
+	depends on USB_SUPPORT
+	default y
+	help
+	  This option enables the USB PHY on the S3C2443.
+
+	  IMPORTANT: After enabling/disabling the functionality of the USB PHY
+	  please verify that the UDC controller is correctly configured. When
+	  disabling the S3C2443-UDC the configuration menu selects automatically
+	  another one. The reconfiguration can be done under:
+
+	  Device Drivers > USB support > USB Gadget Support
+
 choice
 	prompt "Functionality"
 	depends on S3C2443_USB_PHY
 	bool
 
 config S3C2443_USB_PHY_UDC
-        bool "Device Controller"
-        select USB_GADGET
-        select USB_GADGET_SELECTED
-        select USB_GADGET_DUALSPEED
-        select USB_GADGET_S3C2443
-        select USB_S3C2443
-        help
+	bool "Device Controller"
+	select USB_GADGET
+	select USB_GADGET_SELECTED
+	select USB_GADGET_DUALSPEED
+	select USB_GADGET_S3C2443
+	select USB_S3C2443
+	help
 	  This option enables the USB PHY to work as device controller. Additionally
 	  it enables the USB Gadget framework.
-	  
+
 config S3C2443_USB_PHY_PORT
-        bool "Second root hub port"
-        select USB_OHCI_HCD
-        help
-          This options enables the USB PHY to work as second USB root hub port.
+	bool "Second root hub port"
+	select USB_OHCI_HCD
+	help
+	  This options enables the USB PHY to work as second USB root hub port.
 
 endchoice # S3C2443_USB_PHY
-	  
 
 source "arch/arm/mach-s3c2443/displays/Kconfig"
 
diff --git a/arch/arm/mach-s3c2443/displays/Kconfig b/arch/arm/mach-s3c2443/displays/Kconfig
index 83beb59c7989..74466430cc03 100644
--- a/arch/arm/mach-s3c2443/displays/Kconfig
+++ b/arch/arm/mach-s3c2443/displays/Kconfig
@@ -5,7 +5,7 @@
 
 if FB_S3C2443_TFT
 
-menu "ConnectCore 9M/Wi9M 2443 Display Type"
+comment "Display selection"
 
 config CC9M2443_VGA
 	bool "CRT VGA video support"
@@ -29,6 +29,4 @@ config CC9M2443_CUSTOM
 	  This enables the support for a customer specific display.
 	  displays/CUSTOM.h has to be modified when selecting this.
 
-endmenu
 endif
-