[U-Boot] [PATCH v2 13/15] orion5x: kconfig: move board select menu and common settings

[Masahiro Yamada]

Becuase the board select menu in arch/arm/Kconfig is too big,
move the Orion5x board select menu to orion5x/Kconfig.

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and
CONFIG_SYS_SOC="orion5x").

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot at aribaud.net>
---

Changes in v2: None

 arch/arm/Kconfig                       |  7 ++++---
 arch/arm/cpu/arm926ejs/orion5x/Kconfig | 21 +++++++++++++++++++++
 board/LaCie/edminiv2/Kconfig           |  8 --------
 configs/edminiv2_defconfig             |  1 +
 include/configs/edminiv2.h             |  1 -
 5 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/orion5x/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2e8cd2a..74a4e4b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -193,8 +193,8 @@ config TARGET_SC_SPS_1
 config TARGET_NHK8815
 	bool "Support nhk8815"
 
-config TARGET_EDMINIV2
-	bool "Support edminiv2"
+config ORION5X
+	bool "Marvell Orion"
 
 config TARGET_DKB
 	bool "Support dkb"
@@ -510,6 +510,8 @@ source "arch/arm/cpu/armv7/omap4/Kconfig"
 
 source "arch/arm/cpu/armv7/omap5/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/orion5x/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -523,7 +525,6 @@ source "board/BuR/tseries/Kconfig"
 source "board/BuS/eb_cpux9k2/Kconfig"
 source "board/BuS/vl_ma2sc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
-source "board/LaCie/edminiv2/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
new file mode 100644
index 0000000..aa40099
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
@@ -0,0 +1,21 @@
+if ORION5X
+
+choice
+	prompt "Marvell Orion board select"
+
+config TARGET_EDMINIV2
+	bool "LaCie Ethernet Disk mini V2"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_SOC
+	string
+	default "orion5x"
+
+source "board/LaCie/edminiv2/Kconfig"
+
+endif
diff --git a/board/LaCie/edminiv2/Kconfig b/board/LaCie/edminiv2/Kconfig
index f1151d1..9675a9e 100644
--- a/board/LaCie/edminiv2/Kconfig
+++ b/board/LaCie/edminiv2/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_EDMINIV2
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "edminiv2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "LaCie"
 
-config SYS_SOC
-	string
-	default "orion5x"
-
 config SYS_CONFIG_NAME
 	string
 	default "edminiv2"
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 82aa684..3b1a6c1 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 77717a8..1df4fc1 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -25,7 +25,6 @@
 #define CONFIG_MARVELL		1
 #define CONFIG_ARM926EJS	1	/* Basic Architecture */
 #define CONFIG_FEROCEON		1	/* CPU Core subversion */
-#define CONFIG_ORION5X		1	/* SOC Family Name */
 #define CONFIG_88F5182		1	/* SOC Name */
 #define CONFIG_MACH_EDMINIV2	1	/* Machine type */
 
-- 
1.9.1