All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 15/15] nomadik: kconfig: move board select menu and common settings
Date: Wed,  6 Aug 2014 12:18:03 +0900	[thread overview]
Message-ID: <1407295083-31995-16-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1407295083-31995-1-git-send-email-yamada.m@jp.panasonic.com>

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3ffadb6..54e78cc 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"
@@ -506,6 +506,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"
@@ -634,7 +636,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 0000000..7177800
--- /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 ec3f880..ba2e7c2 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 3d20199..f661226 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 860ae92..dd8048d 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 4d3428c..5419f55 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 */
 
-- 
1.9.1

  parent reply	other threads:[~2014-08-06  3:18 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-06  3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 01/15] omap: remove omap5912osk board support Masahiro Yamada
2014-08-23 12:45   ` [U-Boot] [U-Boot, v2, " Tom Rini
2014-08-06  3:17 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings Masahiro Yamada
2014-08-06  6:39   ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings Michal Simek
2014-08-06  6:49     ` Masahiro Yamada
2014-08-06  7:57       ` Michal Simek
2014-08-06  8:31         ` Masahiro Yamada
2014-08-06  9:10           ` Michal Simek
2014-08-06  9:48             ` Masahiro Yamada
2014-08-06 11:27               ` Michal Simek
2014-08-18  2:55                 ` Masahiro Yamada
2014-08-06 11:27               ` Michal Simek
2014-08-06  3:17 ` [U-Boot] [PATCH v2 03/15] tegra: kconfig: move board select menu and common settings Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 04/15] rmobile: " Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 05/15] versatile: kconfig: move " Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig Masahiro Yamada
2014-08-06 10:05   ` Prafulla Wadaskar
2014-08-06 10:09     ` Prafulla Wadaskar
2014-08-20 10:14       ` Albert ARIBAUD
2014-08-06  3:17 ` [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings Masahiro Yamada
2014-08-12  2:43   ` Minkyu Kang
2014-08-22  8:16     ` Lukasz Majewski
2014-08-22  8:24       ` Masahiro Yamada
2014-08-22  8:27         ` Lukasz Majewski
2014-08-28 19:53         ` Tom Rini
2014-08-29  2:57           ` Masahiro Yamada
2014-08-29 14:38             ` Tom Rini
2014-08-06  3:17 ` [U-Boot] [PATCH v2 08/15] davinci: " Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 09/15] omap3: " Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 10/15] omap4: " Masahiro Yamada
2014-08-06  3:17 ` [U-Boot] [PATCH v2 11/15] omap5: " Masahiro Yamada
2014-08-06  3:18 ` [U-Boot] [PATCH v2 12/15] keystone: " Masahiro Yamada
2014-08-06  3:18 ` [U-Boot] [PATCH v2 13/15] orion5x: " Masahiro Yamada
2014-08-06  3:18 ` [U-Boot] [PATCH v2 14/15] highbank: kconfig: move " Masahiro Yamada
2014-08-06  3:18 ` Masahiro Yamada [this message]
2014-08-09  8:00 ` [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro YAMADA

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1407295083-31995-16-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.