@@ -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"
new file mode 100644
@@ -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
@@ -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"
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2E_EVM=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2HK_EVM=y