Commit 16e16fdd authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini

nomadik: kconfig: move board select menu and common settings

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

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and
CONFIG_SYS_SOC="nomadik").
Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent ef2b694c
......@@ -190,8 +190,8 @@ config TARGET_SANSA_FUZE_PLUS
config TARGET_SC_SPS_1
bool "Support sc_sps_1"
config TARGET_NHK8815
bool "Support nhk8815"
config ARCH_NOMADIK
bool "ST-Ericsson Nomadik"
config ORION5X
bool "Marvell Orion"
......@@ -518,6 +518,8 @@ source "arch/arm/cpu/armv7/keystone/Kconfig"
source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
source "arch/arm/cpu/armv7/omap3/Kconfig"
source "arch/arm/cpu/armv7/omap4/Kconfig"
......@@ -650,7 +652,6 @@ source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig"
source "board/st-ericsson/snowball/Kconfig"
source "board/st-ericsson/u8500/Kconfig"
source "board/st/nhk8815/Kconfig"
source "board/sunxi/Kconfig"
source "board/syteco/jadecpu/Kconfig"
source "board/syteco/zmx25/Kconfig"
......
if ARCH_NOMADIK
choice
prompt "Nomadik board select"
config NOMADIK_NHK8815
bool "ST 8815 Nomadik Hardware Kit"
endchoice
config SYS_CPU
string
default "arm926ejs"
config SYS_SOC
string
default "nomadik"
source "board/st/nhk8815/Kconfig"
endif
if TARGET_NHK8815
config SYS_CPU
string
default "arm926ejs"
if NOMADIK_NHK8815
config SYS_BOARD
string
......@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "st"
config SYS_SOC
string
default "nomadik"
config SYS_CONFIG_NAME
string
default "nhk8815"
......
CONFIG_ARM=y
CONFIG_TARGET_NHK8815=y
CONFIG_ARCH_NOMADIK=y
CONFIG_NOMADIK_NHK8815=y
CONFIG_SYS_EXTRA_OPTIONS="BOOT_ONENAND"
CONFIG_ARM=y
CONFIG_TARGET_NHK8815=y
CONFIG_ARCH_NOMADIK=y
CONFIG_NOMADIK_NHK8815=y
......@@ -13,9 +13,7 @@
#include <nomadik.h>
#define CONFIG_ARM926EJS
#define CONFIG_NOMADIK
#define CONFIG_NOMADIK_8815 /* cpu variant */
#define CONFIG_NOMADIK_NHK8815 /* board variant */
#define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment