summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-31 07:11:08 +0900
committerTom Rini <trini@ti.com>2014-08-30 21:22:00 -0400
commit16e16fdde21c9255e338d2eaea339c3ca905da22 (patch)
treeb94064ad61fe5a771545373f92ef7cd324a000f4
parentef2b694c731f93a70aa06e84b52a27f6cc9dbc10 (diff)
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: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--arch/arm/Kconfig7
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/Kconfig21
-rw-r--r--board/st/nhk8815/Kconfig10
-rw-r--r--configs/nhk8815_defconfig3
-rw-r--r--configs/nhk8815_onenand_defconfig3
-rw-r--r--include/configs/nhk8815.h2
6 files changed, 30 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8f5f423795..3094ed6708 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/cpu/arm926ejs/nomadik/Kconfig
new file mode 100644
index 0000000000..7177800a61
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/nomadik/Kconfig
@@ -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
diff --git a/board/st/nhk8815/Kconfig b/board/st/nhk8815/Kconfig
index ec3f880dea..ba2e7c2e09 100644
--- a/board/st/nhk8815/Kconfig
+++ b/board/st/nhk8815/Kconfig
@@ -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"
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index 3d20199b00..f661226897 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
-CONFIG_TARGET_NHK8815=y
+CONFIG_ARCH_NOMADIK=y
+CONFIG_NOMADIK_NHK8815=y
diff --git a/configs/nhk8815_onenand_defconfig b/configs/nhk8815_onenand_defconfig
index 860ae92612..dd8048df74 100644
--- a/configs/nhk8815_onenand_defconfig
+++ b/configs/nhk8815_onenand_defconfig
@@ -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
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 4d3428cb81..5419f551d3 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -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 */