omap5: kconfig: move board select menu and common settings

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

Move also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="omap5").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Tom Rini <trini@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>

11 files changed, 38 insertions, 36 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 639b8ccaa5..7a191c733b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -418,14 +418,8 @@ config OMAP34XX
 config OMAP44XX
 	bool "OMAP44XX SoC"
 
-config TARGET_CM_T54
-	bool "Support cm_t54"
-
-config TARGET_DRA7XX_EVM
-	bool "Support dra7xx_evm"
-
-config TARGET_OMAP5_UEVM
-	bool "Support omap5_uevm"
+config OMAP54XX
+	bool "OMAP54XX SoC"
 
 config RMOBILE
 	bool "Renesas ARM SoCs"
@@ -527,6 +521,8 @@ source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 source "arch/arm/cpu/armv7/omap4/Kconfig"
 
+source "arch/arm/cpu/armv7/omap5/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -576,7 +572,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
-source "board/compulab/cm_t54/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
@@ -661,9 +656,7 @@ source "board/syteco/zmx25/Kconfig"
 source "board/taskit/stamp9g20/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
-source "board/ti/dra7xx/Kconfig"
 source "board/ti/ks2_evm/Kconfig"
-source "board/ti/omap5_uevm/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
new file mode 100644
index 0000000000..be803939bc
--- /dev/null
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -0,0 +1,29 @@
+if OMAP54XX
+
+choice
+	prompt "OMAP5 board select"
+
+config TARGET_CM_T54
+	bool "CompuLab CM-T54"
+
+config TARGET_OMAP5_UEVM
+	bool "TI OMAP5 uEVM board"
+
+config TARGET_DRA7XX_EVM
+	bool "TI DRA7XX"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "omap5"
+
+source "board/compulab/cm_t54/Kconfig"
+source "board/ti/omap5_uevm/Kconfig"
+source "board/ti/dra7xx/Kconfig"
+
+endif
diff --git a/board/compulab/cm_t54/Kconfig b/board/compulab/cm_t54/Kconfig
index 0fe3692c9f..0edab5c76a 100644
--- a/board/compulab/cm_t54/Kconfig
+++ b/board/compulab/cm_t54/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_CM_T54
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "cm_t54"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compulab"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "cm_t54"
diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig
index 4b13ef4282..9ee13c53d3 100644
--- a/board/ti/dra7xx/Kconfig
+++ b/board/ti/dra7xx/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DRA7XX_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "dra7xx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "dra7xx_evm"
diff --git a/board/ti/omap5_uevm/Kconfig b/board/ti/omap5_uevm/Kconfig
index 7c7d5dcc0f..3592e7be03 100644
--- a/board/ti/omap5_uevm/Kconfig
+++ b/board/ti/omap5_uevm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_OMAP5_UEVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "omap5_uevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap5_uevm"
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index b48a171a24..32efaa233a 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_CM_T54=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 82cffd7b19..297c6b5879 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig
index be09f40892..92417f267b 100644
--- a/configs/dra7xx_evm_qspiboot_defconfig
+++ b/configs/dra7xx_evm_qspiboot_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig
index e0d1e45875..3551317a14 100644
--- a/configs/dra7xx_evm_uart3_defconfig
+++ b/configs/dra7xx_evm_uart3_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 7a19ce9e97..86d5c1662e 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_OMAP5_UEVM=y
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index cb928ab8e6..3166392c78 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -17,7 +17,6 @@
 #ifndef __CONFIG_TI_OMAP5_COMMON_H
 #define __CONFIG_TI_OMAP5_COMMON_H
 
-#define CONFIG_OMAP54XX
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R