keystone2: Move target selection to Kconfig

The config option TARGET_K2x_EVM is set by the k2x defconfigs to pick
a board target, but the header configs also set K2x_EVM. This config
is redundant, remove it and use TARGET_K2x_EVM everywhere in its place.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Andrew F. Davis 2016-11-18 11:56:15 -06:00 committed by Tom Rini
parent 384b1d507f
commit ac34286647
6 changed files with 11 additions and 15 deletions

View File

@ -18,5 +18,5 @@ endif
obj-y += msmc.o
obj-y += ddr3.o
obj-y += keystone.o
obj-$(CONFIG_K2E_EVM) += ddr3_spd.o
obj-$(CONFIG_K2HK_EVM) += ddr3_spd.o
obj-$(CONFIG_TARGET_K2E_EVM) += ddr3_spd.o
obj-$(CONFIG_TARGET_K2HK_EVM) += ddr3_spd.o

View File

@ -6,12 +6,12 @@
#
obj-y += board.o
obj-$(CONFIG_K2HK_EVM) += board_k2hk.o
obj-$(CONFIG_K2HK_EVM) += ddr3_k2hk.o
obj-$(CONFIG_K2E_EVM) += board_k2e.o
obj-$(CONFIG_K2E_EVM) += ddr3_k2e.o
obj-$(CONFIG_K2L_EVM) += board_k2l.o
obj-$(CONFIG_K2L_EVM) += ddr3_k2l.o
obj-$(CONFIG_K2L_EVM) += ddr3_cfg.o
obj-$(CONFIG_K2G_EVM) += board_k2g.o
obj-$(CONFIG_K2G_EVM) += ddr3_k2g.o
obj-$(CONFIG_TARGET_K2HK_EVM) += board_k2hk.o
obj-$(CONFIG_TARGET_K2HK_EVM) += ddr3_k2hk.o
obj-$(CONFIG_TARGET_K2E_EVM) += board_k2e.o
obj-$(CONFIG_TARGET_K2E_EVM) += ddr3_k2e.o
obj-$(CONFIG_TARGET_K2L_EVM) += board_k2l.o
obj-$(CONFIG_TARGET_K2L_EVM) += ddr3_k2l.o
obj-$(CONFIG_TARGET_K2L_EVM) += ddr3_cfg.o
obj-$(CONFIG_TARGET_K2G_EVM) += board_k2g.o
obj-$(CONFIG_TARGET_K2G_EVM) += ddr3_k2g.o

View File

@ -12,7 +12,6 @@
/* Platform type */
#define CONFIG_SOC_K2E
#define CONFIG_K2E_EVM
/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \

View File

@ -12,7 +12,6 @@
/* Platform type */
#define CONFIG_SOC_K2G
#define CONFIG_K2G_EVM
/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \

View File

@ -12,7 +12,6 @@
/* Platform type */
#define CONFIG_SOC_K2HK
#define CONFIG_K2HK_EVM
/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \

View File

@ -12,7 +12,6 @@
/* Platform type */
#define CONFIG_SOC_K2L
#define CONFIG_K2L_EVM
/* U-Boot general configuration */
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \