[U-Boot] [U-Boot 1/2] keystone2: Move target selection to Kconfig

[Lokesh Vutla]

On Friday 04 November 2016 02:06 AM, Andrew F. Davis wrote:
> The config option TARGET_K2E_EVM is set by the k2x defconfigs to pick
> a board target, but the header configs also set K2E_EVM. This config
> is redundant, remove it and use TARGET_K2E_EVM everywhere in its place.

I guess the patch is not restricted to K2E as said in this commit
message. Can you update it?

With that addressed,
Reviewed-by: Lokesh Vutla <lokeshvutla at ti.com>

Thanks and regards,
Lokesh

> 
> Signed-off-by: Andrew F. Davis <afd at ti.com>
> ---
>  arch/arm/mach-keystone/Makefile |  4 ++--
>  board/ti/ks2_evm/Makefile       | 34 +++++++++++++++++-----------------
>  include/configs/k2e_evm.h       |  1 -
>  include/configs/k2g_evm.h       |  1 -
>  include/configs/k2hk_evm.h      |  1 -
>  include/configs/k2l_evm.h       |  1 -
>  6 files changed, 19 insertions(+), 23 deletions(-)
>  rewrite board/ti/ks2_evm/Makefile (66%)
> 
> diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
> index b2ffe5b..8253a3b 100644
> --- a/arch/arm/mach-keystone/Makefile
> +++ b/arch/arm/mach-keystone/Makefile
> @@ -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
> diff --git a/board/ti/ks2_evm/Makefile b/board/ti/ks2_evm/Makefile
> dissimilarity index 66%
> index 7ef2d2b..879f8b5 100644
> --- a/board/ti/ks2_evm/Makefile
> +++ b/board/ti/ks2_evm/Makefile
> @@ -1,17 +1,17 @@
> -#
> -# KS2-EVM: board Makefile
> -# (C) Copyright 2012-2015
> -#     Texas Instruments Incorporated, <www.ti.com>
> -# SPDX-License-Identifier:     GPL-2.0+
> -#
> -
> -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
> +#
> +# KS2-EVM: board Makefile
> +# (C) Copyright 2012-2015
> +#     Texas Instruments Incorporated, <www.ti.com>
> +# SPDX-License-Identifier:     GPL-2.0+
> +#
> +
> +obj-y += board.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
> diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
> index 8d6471a..777f225 100644
> --- a/include/configs/k2e_evm.h
> +++ b/include/configs/k2e_evm.h
> @@ -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				\
> diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
> index a145445..2da0d8d 100644
> --- a/include/configs/k2g_evm.h
> +++ b/include/configs/k2g_evm.h
> @@ -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				\
> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
> index 913d454..4adb119 100644
> --- a/include/configs/k2hk_evm.h
> +++ b/include/configs/k2hk_evm.h
> @@ -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				\
> diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
> index 395e61c..9bdd565 100644
> --- a/include/configs/k2l_evm.h
> +++ b/include/configs/k2l_evm.h
> @@ -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				\
>