diff mbox

[U-Boot,v2,14/15] highbank: kconfig: move common settings

Message ID 1407295083-31995-15-git-send-email-yamada.m@jp.panasonic.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Aug. 6, 2014, 3:18 a.m. UTC 
Move Highbank-specific settings to highbank/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Rob Herring <robh@kernel.org>
---

Changes in v2: None

 arch/arm/Kconfig                               | 7 ++++---
 {board => arch/arm/cpu/armv7}/highbank/Kconfig | 2 +-
 configs/highbank_defconfig                     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {board => arch/arm/cpu/armv7}/highbank/Kconfig (90%)
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 74a4e4b..3ffadb6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -328,8 +328,8 @@  config TARGET_BCM28155_AP
 config ARCH_EXYNOS
 	bool "Samsung EXYNOS"
 
-config TARGET_HIGHBANK
-	bool "Support highbank"
+config ARCH_HIGHBANK
+	bool "Calxeda Highbank"
 
 config ARCH_KEYSTONE
 	bool "TI Keystone"
@@ -500,6 +500,8 @@  source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
+source "arch/arm/cpu/armv7/highbank/Kconfig"
+
 source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -593,7 +595,6 @@  source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
-source "board/highbank/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
diff --git a/board/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig
similarity index 90%
rename from board/highbank/Kconfig
rename to arch/arm/cpu/armv7/highbank/Kconfig
index 1c32490..9527928 100644
--- a/board/highbank/Kconfig
+++ b/arch/arm/cpu/armv7/highbank/Kconfig
@@ -1,4 +1,4 @@ 
-if TARGET_HIGHBANK
+if ARCH_HIGHBANK
 
 config SYS_CPU
 	string
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 23fd52d..88efbdf 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,2 +1,2 @@ 
 CONFIG_ARM=y
-CONFIG_TARGET_HIGHBANK=y
+CONFIG_ARCH_HIGHBANK=y