ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig

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

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-09-12 20:32:33 -04:00
parent f899cc1432
commit 4b62ba8fa2
5 changed files with 16 additions and 12 deletions

View file

@ -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"

View file

@ -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 \

View file

@ -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 \

View file

@ -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 \

View file

@ -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 \