summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-31 07:11:06 +0900
committerTom Rini <trini@ti.com>2014-08-30 21:21:59 -0400
commit22f2be7a122410862b68e4ceb901d677c1b5fee8 (patch)
tree6987b8b4b118c315bd02b79d4f60d3cdd34c0fb2 /arch
parentc338f09e965a300ddd78af73e86c4af4c9464ce4 (diff)
downloadu-boot-imx-22f2be7a122410862b68e4ceb901d677c1b5fee8.zip
u-boot-imx-22f2be7a122410862b68e4ceb901d677c1b5fee8.tar.gz
u-boot-imx-22f2be7a122410862b68e4ceb901d677c1b5fee8.tar.bz2
orion5x: kconfig: move board select menu and common settings
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@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig7
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/Kconfig21
2 files changed, 25 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8ac16f9..20b580c 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"
@@ -522,6 +522,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"
@@ -536,7 +538,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