highbank: kconfig: move common settings

Move Highbank-specific settings to highbank/Kconfig.

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 20b580c6817b3e6733759ecadb9d77af5331714e..8f5f4237957c1d3d29fd6c874943f1cb62aa0e26 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -334,8 +334,8 @@ config TARGET_BCM958622HR
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
 
-config TARGET_HIGHBANK
-       bool "Support highbank"
+config ARCH_HIGHBANK
+       bool "Calxeda Highbank"
 
 config ARCH_KEYSTONE
        bool "TI Keystone"
@@ -512,6 +512,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"
@@ -609,7 +611,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/arch/arm/cpu/armv7/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig
new file mode 100644 (file)
index 0000000..9527928
--- /dev/null
+++ b/arch/arm/cpu/armv7/highbank/Kconfig
@@ -0,0 +1,19 @@
+if ARCH_HIGHBANK
+
+config SYS_CPU
+       string
+       default "armv7"
+
+config SYS_BOARD
+       string
+       default "highbank"
+
+config SYS_SOC
+       string
+       default "highbank"
+
+config SYS_CONFIG_NAME
+       string
+       default "highbank"
+
+endif

diff --git a/board/highbank/Kconfig b/board/highbank/Kconfig
deleted file mode 100644 (file)
index 1c32490..0000000
--- a/board/highbank/Kconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-if TARGET_HIGHBANK
-
-config SYS_CPU
-       string
-       default "armv7"
-
-config SYS_BOARD
-       string
-       default "highbank"
-
-config SYS_SOC
-       string
-       default "highbank"
-
-config SYS_CONFIG_NAME
-       string
-       default "highbank"
-
-endif

diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 23fd52d925a6e06988abe35a95560895d39870b2..88efbdfc107e5f464d457b9f72855844b9e43352 100644 (file)
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,2 +1,2 @@
 CONFIG_ARM=y
-CONFIG_TARGET_HIGHBANK=y
+CONFIG_ARCH_HIGHBANK=y