[PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig

[Tom Rini]

Move the individual keystone 2 SoC symbols to the mach Kconfig file,
select them as needed.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/mach-keystone/Kconfig | 16 ++++++++++++++++
 include/configs/k2e_evm.h      |  3 ---
 include/configs/k2g_evm.h      |  3 ---
 include/configs/k2hk_evm.h     |  3 ---
 include/configs/k2l_evm.h      |  3 ---
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index e06eba5aea1f..94e6fe1f2285 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -6,6 +6,7 @@ choice
 
 config TARGET_K2HK_EVM
 	bool "TI Keystone 2 Kepler/Hawking EVM"
+	select SOC_K2HK
 	select SPL_BOARD_INIT if SPL
 	select CMD_DDR3
 	imply DM_I2C
@@ -14,6 +15,7 @@ config TARGET_K2HK_EVM
 
 config TARGET_K2E_EVM
 	bool "TI Keystone 2 Edison EVM"
+	select SOC_K2E
 	select SPL_BOARD_INIT if SPL
 	select CMD_DDR3
 	imply DM_I2C
@@ -22,6 +24,7 @@ config TARGET_K2E_EVM
 
 config TARGET_K2L_EVM
 	bool "TI Keystone 2 Lamar EVM"
+	select SOC_K2L
 	select SPL_BOARD_INIT if SPL
 	select CMD_DDR3
 	imply DM_I2C
@@ -31,6 +34,7 @@ config TARGET_K2L_EVM
 config TARGET_K2G_EVM
 	bool "TI Keystone 2 Galileo EVM"
         select BOARD_LATE_INIT
+	select SOC_K2G
 	select SPL_BOARD_INIT if SPL
         select TI_I2C_BOARD_DETECT
 	select CMD_DDR3
@@ -40,6 +44,18 @@ config TARGET_K2G_EVM
 
 endchoice
 
+config SOC_K2E
+	bool
+
+config SOC_K2G
+	bool
+
+config SOC_K2HK
+	bool
+
+config SOC_K2L
+	bool
+
 config SYS_SOC
 	default "keystone"
 
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 35439c02581a..9b25c3498223 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -11,9 +11,6 @@
 
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2E
-
 #ifdef CONFIG_TI_SECURE_DEVICE
 #define DEFAULT_SEC_BOOT_ENV						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 17245ab15861..56dd9c72d949 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -12,9 +12,6 @@
 #include <environment/ti/mmc.h>
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2G
-
 /* U-Boot general configuration */
 #define ENV_KS2_BOARD_SETTINGS						\
 	DEFAULT_MMC_TI_ARGS						\
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index f5a20ce02b06..cfc34c7da6d7 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -11,9 +11,6 @@
 
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2HK
-
 #ifdef CONFIG_TI_SECURE_DEVICE
 #define DEFAULT_SEC_BOOT_ENV						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 97512c9903de..65988fff06ed 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -11,9 +11,6 @@
 
 #include <environment/ti/spi.h>
 
-/* Platform type */
-#define CONFIG_SOC_K2L
-
 #ifdef CONFIG_TI_SECURE_DEVICE
 #define DEFAULT_SEC_BOOT_ENV						\
 	DEFAULT_FIT_TI_ARGS						\
-- 
2.17.1