ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in
authorRyan Mallon <ryan@bluewatersys.com>
Fri, 20 May 2011 07:34:24 +0000 (08:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 May 2011 21:34:25 +0000 (22:34 +0100)
Now that all three SPEAr3xx platforms can be built into one kernel,
rework KConfig to allow this. Move everything into one KConfig file
while we are here.

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-spear3xx/Kconfig
arch/arm/mach-spear3xx/Kconfig300 [deleted file]
arch/arm/mach-spear3xx/Kconfig310 [deleted file]
arch/arm/mach-spear3xx/Kconfig320 [deleted file]

index 20d1317cc486b1c7a1cf0f7c1b4e6f37f4bc3c98..2cee6b0de3712db9b10d99ad5066209834d5227a 100644 (file)
@@ -4,9 +4,26 @@
 
 if ARCH_SPEAR3XX
 
-choice
-       prompt "SPEAr3XX Family"
-       default MACH_SPEAR300
+menu "SPEAr3xx Implementations"
+config BOARD_SPEAR300_EVB
+       bool "SPEAr300 Evaluation Board"
+       select MACH_SPEAR300
+       help
+         Supports ST SPEAr300 Evaluation Board
+
+config BOARD_SPEAR310_EVB
+       bool "SPEAr310 Evaluation Board"
+       select MACH_SPEAR310
+       help
+         Supports ST SPEAr310 Evaluation Board
+
+config BOARD_SPEAR320_EVB
+       bool "SPEAr320 Evaluation Board"
+       select MACH_SPEAR320
+       help
+         Supports ST SPEAr320 Evaluation Board
+
+endmenu
 
 config MACH_SPEAR300
        bool "SPEAr300"
@@ -23,11 +40,4 @@ config MACH_SPEAR320
        help
          Supports ST SPEAr320 Machine
 
-endchoice
-
-# Adding SPEAr3XX machine specific configuration files
-source "arch/arm/mach-spear3xx/Kconfig300"
-source "arch/arm/mach-spear3xx/Kconfig310"
-source "arch/arm/mach-spear3xx/Kconfig320"
-
 endif #ARCH_SPEAR3XX
diff --git a/arch/arm/mach-spear3xx/Kconfig300 b/arch/arm/mach-spear3xx/Kconfig300
deleted file mode 100644 (file)
index c519a05..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr300 machine configuration file
-#
-
-if MACH_SPEAR300
-
-choice
-       prompt "SPEAr300 Boards"
-       default BOARD_SPEAR300_EVB
-
-config BOARD_SPEAR300_EVB
-       bool "SPEAr300 Evaluation Board"
-       help
-         Supports ST SPEAr300 Evaluation Board
-endchoice
-
-endif  #MACH_SPEAR300
diff --git a/arch/arm/mach-spear3xx/Kconfig310 b/arch/arm/mach-spear3xx/Kconfig310
deleted file mode 100644 (file)
index 60e7442..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr310 machine configuration file
-#
-
-if MACH_SPEAR310
-
-choice
-       prompt "SPEAr310 Boards"
-       default BOARD_SPEAR310_EVB
-
-config BOARD_SPEAR310_EVB
-       bool "SPEAr310 Evaluation Board"
-       help
-         Supports ST SPEAr310 Evaluation Board
-endchoice
-
-endif  #MACH_SPEAR310
diff --git a/arch/arm/mach-spear3xx/Kconfig320 b/arch/arm/mach-spear3xx/Kconfig320
deleted file mode 100644 (file)
index 1c1d438..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr320 machine configuration file
-#
-
-if MACH_SPEAR320
-
-choice
-       prompt "SPEAr320 Boards"
-       default BOARD_SPEAR320_EVB
-
-config BOARD_SPEAR320_EVB
-       bool "SPEAr320 Evaluation Board"
-       help
-         Supports ST SPEAr320 Evaluation Board
-endchoice
-
-endif  #MACH_SPEAR320