4 files changed, 20 insertions, 61 deletions

diff --git a/arch/arm/mach-spear3xx/Kconfig b/arch/arm/mach-spear3xx/Kconfig
index 20d1317cc48..2cee6b0de37 100644
--- a/arch/arm/mach-spear3xx/Kconfig
+++ b/arch/arm/mach-spear3xx/Kconfig
@@ -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
index c519a05b4ab..00000000000
--- a/arch/arm/mach-spear3xx/Kconfig300
+++ /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
index 60e7442d75b..00000000000
--- a/arch/arm/mach-spear3xx/Kconfig310
+++ /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
index 1c1d438399b..00000000000
--- a/arch/arm/mach-spear3xx/Kconfig320
+++ /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