Becuase the board select menu in arch/arm/Kconfig is too big, move the Keystone board select menu to keystone/Kconfig.
Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="keystone").
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Tom Rini trini@ti.com ---
arch/arm/Kconfig | 10 ++++------ arch/arm/cpu/armv7/keystone/Kconfig | 24 ++++++++++++++++++++++++ board/ti/ks2_evm/Kconfig | 16 ---------------- configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + 5 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fd8bc59..2e8cd2a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -331,11 +331,8 @@ config ARCH_EXYNOS config TARGET_HIGHBANK bool "Support highbank"
-config TARGET_K2E_EVM - bool "Support k2e_evm" - -config TARGET_K2HK_EVM - bool "Support k2hk_evm" +config ARCH_KEYSTONE + bool "TI Keystone"
config TARGET_M53EVK bool "Support m53evk" @@ -503,6 +500,8 @@ source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
source "arch/arm/cpu/armv7/exynos/Kconfig"
+source "arch/arm/cpu/armv7/keystone/Kconfig" + source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
source "arch/arm/cpu/armv7/omap3/Kconfig" @@ -640,7 +639,6 @@ source "board/syteco/zmx25/Kconfig" source "board/taskit/stamp9g20/Kconfig" source "board/ti/am335x/Kconfig" source "board/ti/am43xx/Kconfig" -source "board/ti/ks2_evm/Kconfig" source "board/ti/ti814x/Kconfig" source "board/ti/ti816x/Kconfig" source "board/ti/tnetv107xevm/Kconfig" diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/cpu/armv7/keystone/Kconfig new file mode 100644 index 0000000..24d0cbe --- /dev/null +++ b/arch/arm/cpu/armv7/keystone/Kconfig @@ -0,0 +1,24 @@ +if ARCH_KEYSTONE + +choice + prompt "TI Keystone board select" + +config TARGET_K2HK_EVM + bool "TI Keystone 2 Kepler/Hawking EVM" + +config TARGET_K2E_EVM + bool "TI Keystone 2 Edison EVM" + +endchoice + +config SYS_CPU + string + default "armv7" + +config SYS_SOC + string + default "keystone" + +source "board/ti/ks2_evm/Kconfig" + +endif diff --git a/board/ti/ks2_evm/Kconfig b/board/ti/ks2_evm/Kconfig index 7890b30..3108782 100644 --- a/board/ti/ks2_evm/Kconfig +++ b/board/ti/ks2_evm/Kconfig @@ -1,9 +1,5 @@ if TARGET_K2E_EVM
-config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "ks2_evm" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "ti"
-config SYS_SOC - string - default "keystone" - config SYS_CONFIG_NAME string default "k2e_evm" @@ -24,10 +16,6 @@ endif
if TARGET_K2HK_EVM
-config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "ks2_evm" @@ -36,10 +24,6 @@ config SYS_VENDOR string default "ti"
-config SYS_SOC - string - default "keystone" - config SYS_CONFIG_NAME string default "k2hk_evm" diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index c210ad5..be8d2ee 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2E_EVM=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index caa763a..eee3335 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2HK_EVM=y