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>
This commit is contained in:
Masahiro Yamada 2014-08-31 07:11:06 +09:00 committed by Tom Rini
parent c338f09e96
commit 22f2be7a12
5 changed files with 26 additions and 12 deletions

View file

@ -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"

View file

@ -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

View file

@ -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"

View file

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ORION5X=y
CONFIG_TARGET_EDMINIV2=y

View file

@ -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 */