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>
config OMAP44XX
bool "OMAP44XX SoC"
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"
config RMOBILE
bool "Renesas ARM SoCs"
source "arch/arm/cpu/armv7/omap4/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"
source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/tegra-common/Kconfig"
source "board/cm4008/Kconfig"
source "board/cm41xx/Kconfig"
source "board/compulab/cm_t335/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"
source "board/congatec/cgtqmx6eval/Kconfig"
source "board/creative/xfi3/Kconfig"
source "board/davedenx/qong/Kconfig"
source "board/taskit/stamp9g20/Kconfig"
source "board/ti/am335x/Kconfig"
source "board/ti/am43xx/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/ks2_evm/Kconfig"
-source "board/ti/omap5_uevm/Kconfig"
source "board/ti/ti814x/Kconfig"
source "board/ti/ti816x/Kconfig"
source "board/ti/tnetv107xevm/Kconfig"
source "board/ti/ti814x/Kconfig"
source "board/ti/ti816x/Kconfig"
source "board/ti/tnetv107xevm/Kconfig"
--- /dev/null
+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
-config SYS_CPU
- string
- default "armv7"
-
config SYS_BOARD
string
default "cm_t54"
config SYS_BOARD
string
default "cm_t54"
string
default "compulab"
string
default "compulab"
-config SYS_SOC
- string
- default "omap5"
-
config SYS_CONFIG_NAME
string
default "cm_t54"
config SYS_CONFIG_NAME
string
default "cm_t54"
-config SYS_CPU
- string
- default "armv7"
-
config SYS_BOARD
string
default "dra7xx"
config SYS_BOARD
string
default "dra7xx"
-config SYS_SOC
- string
- default "omap5"
-
config SYS_CONFIG_NAME
string
default "dra7xx_evm"
config SYS_CONFIG_NAME
string
default "dra7xx_evm"
-config SYS_CPU
- string
- default "armv7"
-
config SYS_BOARD
string
default "omap5_uevm"
config SYS_BOARD
string
default "omap5_uevm"
-config SYS_SOC
- string
- default "omap5"
-
config SYS_CONFIG_NAME
string
default "omap5_uevm"
config SYS_CONFIG_NAME
string
default "omap5_uevm"
CONFIG_SPL=y
+S:CONFIG_ARM=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_CM_T54=y
+S:CONFIG_TARGET_CM_T54=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
+S:CONFIG_ARM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
+S:CONFIG_ARM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
+S:CONFIG_ARM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
+S:CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_OMAP5_UEVM=y
+S:CONFIG_TARGET_OMAP5_UEVM=y
#ifndef __CONFIG_TI_OMAP5_COMMON_H
#define __CONFIG_TI_OMAP5_COMMON_H
#ifndef __CONFIG_TI_OMAP5_COMMON_H
#define __CONFIG_TI_OMAP5_COMMON_H
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_R
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_R