ARM: integrator: move board select into mach-integrator/Kconfig

The board/SoC select menu in arch/arm/Kconfig is still cluttered.
Add ARCH_INTEGRATOR into arch/arm/Kconfig and move the board select
under arch/arm/mach-integrator.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f646c9534dd2603587100d40361bef5636caef53..7abcff12e06660030dccc1c5a274959f0f1feec5 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -65,18 +65,6 @@ config SEMIHOSTING
 choice
        prompt "Target select"
 
-config TARGET_INTEGRATORAP_CM720T
-       bool "Support integratorap_cm720t"
-       select CPU_ARM720T
-
-config TARGET_INTEGRATORAP_CM920T
-       bool "Support integratorap_cm920t"
-       select CPU_ARM920T
-
-config TARGET_INTEGRATORCP_CM920T
-       bool "Support integratorcp_cm920t"
-       select CPU_ARM920T
-
 config ARCH_AT91
        bool "Atmel AT91"
 
@@ -96,14 +84,6 @@ config TARGET_SMDK2410
        bool "Support smdk2410"
        select CPU_ARM920T
 
-config TARGET_INTEGRATORAP_CM926EJS
-       bool "Support integratorap_cm926ejs"
-       select CPU_ARM926EJS
-
-config TARGET_INTEGRATORCP_CM926EJS
-       bool "Support integratorcp_cm926ejs"
-       select CPU_ARM926EJS
-
 config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS
@@ -251,10 +231,6 @@ config ARCH_VERSATILE
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
 
-config TARGET_INTEGRATORCP_CM1136
-       bool "Support integratorcp_cm1136"
-       select CPU_ARM1136
-
 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
@@ -303,14 +279,6 @@ config ARCH_BCM283X
        select DM_SERIAL
        select DM_GPIO
 
-config TARGET_INTEGRATORAP_CM946ES
-       bool "Support integratorap_cm946es"
-       select CPU_ARM946ES
-
-config TARGET_INTEGRATORCP_CM946ES
-       bool "Support integratorcp_cm946es"
-       select CPU_ARM946ES
-
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
        select CPU_V7
@@ -465,6 +433,9 @@ config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
 
+config ARCH_INTEGRATOR
+       bool "ARM Ltd. Integrator family"
+
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
@@ -805,6 +776,8 @@ source "arch/arm/cpu/armv7/exynos/Kconfig"
 
 source "arch/arm/mach-highbank/Kconfig"
 
+source "arch/arm/mach-integrator/Kconfig"
+
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
@@ -850,7 +823,6 @@ source "board/Marvell/db-mv784mp-gp/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
 source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
-source "board/armltd/integrator/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/bachmann/ot1200/Kconfig"

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
new file mode 100644 (file)
index 0000000..4406399
--- /dev/null
+++ b/arch/arm/mach-integrator/Kconfig
@@ -0,0 +1,57 @@
+menu "Integrator Options"
+       depends on ARCH_INTEGRATOR
+
+choice
+       prompt "ARM Ltd. Integrator board select"
+
+config TARGET_INTEGRATORAP_CM720T
+       bool "Support integratorap_cm720t"
+       select CPU_ARM720T
+
+config TARGET_INTEGRATORAP_CM920T
+       bool "Support integratorap_cm920t"
+       select CPU_ARM920T
+
+config TARGET_INTEGRATORCP_CM920T
+       bool "Support integratorcp_cm920t"
+       select CPU_ARM920T
+
+config TARGET_INTEGRATORAP_CM926EJS
+       bool "Support integratorap_cm926ejs"
+       select CPU_ARM926EJS
+
+config TARGET_INTEGRATORCP_CM926EJS
+       bool "Support integratorcp_cm926ejs"
+       select CPU_ARM926EJS
+
+config TARGET_INTEGRATORCP_CM1136
+       bool "Support integratorcp_cm1136"
+       select CPU_ARM1136
+
+config TARGET_INTEGRATORAP_CM946ES
+       bool "Support integratorap_cm946es"
+       select CPU_ARM946ES
+
+config TARGET_INTEGRATORCP_CM946ES
+       bool "Support integratorcp_cm946es"
+       select CPU_ARM946ES
+
+endchoice
+
+config SYS_BOARD
+       default "integrator"
+
+config SYS_VENDOR
+       default "armltd"
+
+config SYS_CONFIG_NAME
+       default "integratorap" if TARGET_INTEGRATORAP_CM720T || \
+                                 TARGET_INTEGRATORAP_CM920T || \
+                                 TARGET_INTEGRATORAP_CM926EJS || \
+                                 TARGET_INTEGRATORAP_CM946ES
+       default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \
+                                 TARGET_INTEGRATORCP_CM926EJS || \
+                                 TARGET_INTEGRATORCP_CM946ES || \
+                                 TARGET_INTEGRATORCP_CM1136
+
+endmenu

diff --git a/board/armltd/integrator/Kconfig b/board/armltd/integrator/Kconfig
deleted file mode 100644 (file)
index 6153b5d..0000000
--- a/board/armltd/integrator/Kconfig
+++ /dev/null
@@ -1,103 +0,0 @@
-if TARGET_INTEGRATORAP_CM720T
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORAP_CM920T
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM920T
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORAP_CM926EJS
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM926EJS
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORCP_CM1136
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORAP_CM946ES
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM946ES
-
-config SYS_BOARD
-       default "integrator"
-
-config SYS_VENDOR
-       default "armltd"
-
-config SYS_CONFIG_NAME
-       default "integratorcp"
-
-endif

diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 0bb7b085cee2b98b07ccd0217c4baecb92db2a81..5c15d570faf5d3cfafb3ce04be3487efeef0c75d 100644 (file)
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM720T"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORAP_CM720T=y

diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index fb925d50b1ec4f2bca1320020bc60332a99b5fce..d2a9a71ea287f9b45ac5b48328d67b0807943a59 100644 (file)
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM920T"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORAP_CM920T=y

diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 308a1e6162a5ad4e9c3ea0cf0c451d8745c2a7a7..af4cfa5b831a6604fbe851aa5eba9d14d4935169 100644 (file)
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORAP_CM926EJS=y

diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index d1b9db5d6af57d4879a04370cbff799a5d8041b4..ee0720631e2aa2cce2c7828c28b5143dfe6e1e94 100644 (file)
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORAP_CM946ES=y

diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 3feb6563f6f0afe2f85e7b4f7a272d8e9194638e..5deedc8c025648d442e51bb038c14316d0653745 100644 (file)
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM1136"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORCP_CM1136=y

diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index f304bbe8eb46bd29b5e711c3bd1121e7f64650b5..5ed8539e4bca09a576d7085ad7111bf104ae6925 100644 (file)
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM920T"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORCP_CM920T=y

diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index a8d762b0047c066a0caddf0b2efe68399b42afb7..4840ec4f97a4cf990ac380f147d1145d11f52ca5 100644 (file)
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORCP_CM926EJS=y

diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index 2e67dbc70a37160a28b38cf8374e32f82b9a63b8..dcd034d245189623b83618078c7d901790ecb099 100644 (file)
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
 CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
 CONFIG_TARGET_INTEGRATORCP_CM946ES=y

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index e168c8c9ba57e35fd333f8d0ffb720cc5e12b1d6..8439db78187b77f35ede8816b58dee8641ed50ca 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -18,7 +18,6 @@
 #include "integrator-common.h"
 
 /* Integrator/AP-specific configuration */
-#define CONFIG_ARCH_INTEGRATOR
 #define CONFIG_SYS_HZ_CLOCK            24000000        /* Timer 1 is clocked at 24Mhz */
 
 /*