@@ -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"
@@ -512,6 +512,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"
@@ -642,7 +644,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"
new file mode 100644
@@ -0,0 +1,21 @@
+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
@@ -1,8 +1,4 @@
-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"
@@ -1,2 +1,3 @@
CONFIG_ARM=y
-CONFIG_TARGET_NHK8815=y
+CONFIG_ARCH_NOMADIK=y
+CONFIG_NOMADIK_NHK8815=y
@@ -1,3 +1,4 @@
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 */
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: Masahiro Yamada <yamada.m@jp.panasonic.com> --- Changes in v3: None Changes in v2: None arch/arm/Kconfig | 7 ++++--- arch/arm/cpu/arm926ejs/nomadik/Kconfig | 21 +++++++++++++++++++++ board/st/nhk8815/Kconfig | 10 +--------- configs/nhk8815_defconfig | 3 ++- configs/nhk8815_onenand_defconfig | 3 ++- include/configs/nhk8815.h | 2 -- 6 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/nomadik/Kconfig