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 05/15] versatile: kconfig: move common settings
Date: Wed,  6 Aug 2014 12:17:53 +0900	[thread overview]
Message-ID: <1407295083-31995-6-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1407295083-31995-1-git-send-email-yamada.m@jp.panasonic.com>

Move Versatile-specific settings to versatile/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v2: None

 arch/arm/Kconfig                         | 13 ++----
 arch/arm/cpu/arm926ejs/versatile/Kconfig | 23 +++++++++++
 board/armltd/versatile/Kconfig           | 71 --------------------------------
 configs/versatileab_defconfig            |  2 +-
 configs/versatilepb_defconfig            |  2 +-
 configs/versatileqemu_defconfig          |  2 +-
 6 files changed, 30 insertions(+), 83 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/versatile/Kconfig
 delete mode 100644 board/armltd/versatile/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a288ee1..955fce8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -308,14 +308,8 @@ config TARGET_SPEAR600
 config TARGET_X600
 	bool "Support x600"
 
-config TARGET_VERSATILEAB
-	bool "Support versatileab"
-
-config TARGET_VERSATILEPB
-	bool "Support versatilepb"
-
-config TARGET_VERSATILEQEMU
-	bool "Support versatileqemu"
+config ARCH_VERSATILE
+	bool "ARM Ltd. Versatile family"
 
 config TARGET_INTEGRATORCP_CM1136
 	bool "Support integratorcp_cm1136"
@@ -708,6 +702,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
+
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
 source "board/8dtech/eco5pk/Kconfig"
@@ -737,7 +733,6 @@ source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/integrator/Kconfig"
-source "board/armltd/versatile/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/cpu/arm926ejs/versatile/Kconfig
new file mode 100644
index 0000000..fc29c98
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/versatile/Kconfig
@@ -0,0 +1,23 @@
+if ARCH_VERSATILE
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "versatile"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_SOC
+	string
+	default "versatile"
+
+config SYS_CONFIG_NAME
+	string
+	default "versatile"
+
+endif
diff --git a/board/armltd/versatile/Kconfig b/board/armltd/versatile/Kconfig
deleted file mode 100644
index f96d0b2..0000000
--- a/board/armltd/versatile/Kconfig
+++ /dev/null
@@ -1,71 +0,0 @@
-if TARGET_VERSATILEAB
-
-config SYS_CPU
-	string
-	default "arm926ejs"
-
-config SYS_BOARD
-	string
-	default "versatile"
-
-config SYS_VENDOR
-	string
-	default "armltd"
-
-config SYS_SOC
-	string
-	default "versatile"
-
-config SYS_CONFIG_NAME
-	string
-	default "versatile"
-
-endif
-
-if TARGET_VERSATILEPB
-
-config SYS_CPU
-	string
-	default "arm926ejs"
-
-config SYS_BOARD
-	string
-	default "versatile"
-
-config SYS_VENDOR
-	string
-	default "armltd"
-
-config SYS_SOC
-	string
-	default "versatile"
-
-config SYS_CONFIG_NAME
-	string
-	default "versatile"
-
-endif
-
-if TARGET_VERSATILEQEMU
-
-config SYS_CPU
-	string
-	default "arm926ejs"
-
-config SYS_BOARD
-	string
-	default "versatile"
-
-config SYS_VENDOR
-	string
-	default "armltd"
-
-config SYS_SOC
-	string
-	default "versatile"
-
-config SYS_CONFIG_NAME
-	string
-	default "versatile"
-
-endif
diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig
index 9d64dd0..94680fe 100644
--- a/configs/versatileab_defconfig
+++ b/configs/versatileab_defconfig
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEAB=y
+CONFIG_ARCH_VERSATILE=y
diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig
index fadaf93..2c59e5c 100644
--- a/configs/versatilepb_defconfig
+++ b/configs/versatilepb_defconfig
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEPB=y
+CONFIG_ARCH_VERSATILE=y
diff --git a/configs/versatileqemu_defconfig b/configs/versatileqemu_defconfig
index 9d24558..fb0485d 100644
--- a/configs/versatileqemu_defconfig
+++ b/configs/versatileqemu_defconfig
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEQEMU=y
+CONFIG_ARCH_VERSATILE=y
-- 
1.9.1

  parent reply	other threads:[~2014-08-06  3:17 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 ` Masahiro Yamada [this message]
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 ` [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-6-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.