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 13/15] orion5x: kconfig: move board select menu and common settings
Date: Wed,  6 Aug 2014 12:18:01 +0900	[thread overview]
Message-ID: <1407295083-31995-14-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 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>
---

Changes in v2: None

 arch/arm/Kconfig                       |  7 ++++---
 arch/arm/cpu/arm926ejs/orion5x/Kconfig | 21 +++++++++++++++++++++
 board/LaCie/edminiv2/Kconfig           |  8 --------
 configs/edminiv2_defconfig             |  1 +
 include/configs/edminiv2.h             |  1 -
 5 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/orion5x/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2e8cd2a..74a4e4b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
@@ -510,6 +510,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"
@@ -523,7 +525,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"
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
new file mode 100644
index 0000000..aa40099
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
@@ -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
diff --git a/board/LaCie/edminiv2/Kconfig b/board/LaCie/edminiv2/Kconfig
index f1151d1..9675a9e 100644
--- a/board/LaCie/edminiv2/Kconfig
+++ b/board/LaCie/edminiv2/Kconfig
@@ -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"
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 82aa684..3b1a6c1 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 77717a8..1df4fc1 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -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 */
 
-- 
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 ` Masahiro Yamada [this message]
2014-08-06  3:18 ` [U-Boot] [PATCH v2 14/15] highbank: kconfig: move " Masahiro Yamada
2014-08-06  3:18 ` [U-Boot] [PATCH v2 15/15] nomadik: kconfig: move board select menu and " Masahiro Yamada
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-14-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.