rmobile: kconfig: move board select menu and common settings

Becuase the board select menu in arch/arm/Kconfig is too big,
move the Rmobile board select menu to rmobile/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="rmobile").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c81307a8be0046387041197d2632b8b2e2aad777..304200e911480eca8d67d2c3be4069b1b7e99b96 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -626,20 +626,8 @@ config TARGET_DRA7XX_EVM
 config TARGET_OMAP5_UEVM
        bool "Support omap5_uevm"
 
-config TARGET_ARMADILLO_800EVA
-       bool "Support armadillo-800eva"
-
-config TARGET_KZM9G
-       bool "Support kzm9g"
-
-config TARGET_ALT
-       bool "Support alt"
-
-config TARGET_KOELSCH
-       bool "Support koelsch"
-
-config TARGET_LAGER
-       bool "Support lager"
+config RMOBILE
+       bool "Renesas ARM SoCs"
 
 config TARGET_S5P_GONI
        bool "Support s5p_goni"
@@ -728,6 +716,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/rmobile/Kconfig"
+
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"
@@ -763,7 +753,6 @@ source "board/armltd/integrator/Kconfig"
 source "board/armltd/versatile/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
-source "board/atmark-techno/armadillo-800eva/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
@@ -856,7 +845,6 @@ source "board/jornada/Kconfig"
 source "board/karo/tk71/Kconfig"
 source "board/karo/tx25/Kconfig"
 source "board/keymile/km_arm/Kconfig"
-source "board/kmc/kzm9g/Kconfig"
 source "board/logicpd/am3517evm/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
@@ -877,9 +865,6 @@ source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
 source "board/raspberrypi/rpi_b/Kconfig"
-source "board/renesas/alt/Kconfig"
-source "board/renesas/koelsch/Kconfig"
-source "board/renesas/lager/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
 source "board/ronetix/pm9g45/Kconfig"

diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
new file mode 100644 (file)
index 0000000..55c620a
--- /dev/null
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
@@ -0,0 +1,37 @@
+if RMOBILE
+
+choice
+       prompt "Renesus ARM SoCs board select"
+
+config TARGET_ARMADILLO_800EVA
+       bool "armadillo 800 eva board"
+
+config TARGET_KOELSCH
+       bool "Koelsch board"
+
+config TARGET_LAGER
+       bool "Lager board"
+
+config TARGET_KZM9G
+       bool "KZM9D board"
+
+config TARGET_ALT
+       bool "Alt board"
+
+endchoice
+
+config SYS_CPU
+       string
+       default "armv7"
+
+config SYS_SOC
+       string
+       default "rmobile"
+
+source "board/atmark-techno/armadillo-800eva/Kconfig"
+source "board/renesas/koelsch/Kconfig"
+source "board/renesas/lager/Kconfig"
+source "board/kmc/kzm9g/Kconfig"
+source "board/renesas/alt/Kconfig"
+
+endif

diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig
index c8f89fe7bba9b7e6c5d6939aad04e96b2f8db2e3..3365c7b61fabe5d33569be22aa132d3a01368bab 100644 (file)
--- a/board/atmark-techno/armadillo-800eva/Kconfig
+++ b/board/atmark-techno/armadillo-800eva/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_ARMADILLO_800EVA
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
        string
        default "armadillo-800eva"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "atmark-techno"
 
-config SYS_SOC
-       string
-       default "rmobile"
-
 config SYS_CONFIG_NAME
        string
        default "armadillo-800eva"

diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig
index 2d401736f28453986b24c1f13a876880b22bca96..ab4812f0007aa02f798969feb8728000bdd0b7ad 100644 (file)
--- a/board/kmc/kzm9g/Kconfig
+++ b/board/kmc/kzm9g/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_KZM9G
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
        string
        default "kzm9g"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "kmc"
 
-config SYS_SOC
-       string
-       default "rmobile"
-
 config SYS_CONFIG_NAME
        string
        default "kzm9g"

diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig
index d317025a764133b2b68f3ff0d6eeb5e80e118b72..dc01a38adbee03b342484d7e8bb12c0c66c30fc6 100644 (file)
--- a/board/renesas/alt/Kconfig
+++ b/board/renesas/alt/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_ALT
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
        string
        default "alt"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "renesas"
 
-config SYS_SOC
-       string
-       default "rmobile"
-
 config SYS_CONFIG_NAME
        string
        default "alt"

diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig
index 0def847fe4dc8a3749f75b6971c884235bb0b053..e7c6437adad6fba61e85636b548a412182fc9ad7 100644 (file)
--- a/board/renesas/koelsch/Kconfig
+++ b/board/renesas/koelsch/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_KOELSCH
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
        string
        default "koelsch"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "renesas"
 
-config SYS_SOC
-       string
-       default "rmobile"
-
 config SYS_CONFIG_NAME
        string
        default "koelsch"

diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig
index e88f4f630a202364c05bbc93e729be70ff7ba09f..07dc98c70576cf6ace95843d2191a9a1851476f3 100644 (file)
--- a/board/renesas/lager/Kconfig
+++ b/board/renesas/lager/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_LAGER
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
        string
        default "lager"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "renesas"
 
-config SYS_SOC
-       string
-       default "rmobile"
-
 config SYS_CONFIG_NAME
        string
        default "lager"

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 11a1c897ce32e086b10a4094ea65375c3a554b78..0655e60372adb4a29802f9f4a5636b78729a5f40 100644 (file)
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_ALT=y

diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 081c88afde5f3f31d35a8e0fcdead3a47d0064da..9b17895623b4e9337829a6080f3e7596543f6ea1 100644 (file)
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_ARMADILLO_800EVA=y

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index d63a286ec4f1d869b9c3131f156d44b1537ac41b..d59ff3dcdeef0143ff40661488272d1c345e27e6 100644 (file)
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_KOELSCH=y

diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index aaddf8294046d84938c3f022752d726b357a242a..d4d340f4bd96031a1a187bd7c60987b434ad5f73 100644 (file)
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index bf1be729313c4d87b2207ad7179aea82491e4e95..9a32d6b16894cdd26fb2f2bd8a6f7c334596090b 100644 (file)
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_LAGER=y

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 9eec4bc231391fb6acf2a002796b4bdc1830bc4c..7238f68820e8678b3bec66efe22ad3ccbc531b4b 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -13,7 +13,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7794
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Alt"
 #define CONFIG_SH_GPIO_PFC
 

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 8bb932ce8c234ff28789e8eb5a3f5f997c996bac..b073b97bae5e0ee2d5876877572abb11c4e967c0 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -12,7 +12,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7740
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC
 

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 3c2b61353bb5ae7c18da428e58f2673db564c595..21667d1f784b318cd7691b513b73a1cc3689698f 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -12,7 +12,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7791
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
 #define CONFIG_SH_GPIO_PFC
 

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 5a13ad11393d7202ecb287c337f9537ae9741e95..ac74ae7fb381b61305e47cebf8676e2702b87a89 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -10,7 +10,6 @@
 
 #undef DEBUG
 
-#define CONFIG_RMOBILE
 #define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
 #define CONFIG_RMOBILE_BOARD_STRING    "KMC KZM-A9-GT"

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 74c998f3d45d0768e65966e29e78d15a0964c476..6e9d67d6900d2f47834fa4ab301d13e36e78b9ed 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -13,7 +13,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7790
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Lager"
 #define CONFIG_SH_GPIO_PFC