keystone2: Move target selection to Kconfig

PATCH Superseded Andrew F. Davis 2 participants 4 messages Nov 3, 2016 – Nov 4, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Texas instrument Keystone architecture

lore

Share & tools

lore

Andrew F. Davis

author

2016-11-03 20:36 UTC #0 lore raw

PATCH 1/2 keystone2: Move target selection to Kconfig

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.

Signed-off-by Andrew F. Davis <[email protected]>

---
 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%)

arch/arm/mach-keystone/Makefile +2 -2

index b2ffe5b..8253a3b 100644
@@ -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

board/ti/ks2_evm/Makefile +17 ~~-17~~

dissimilarity index 66%
index 7ef2d2b..879f8b5 100644
@@ -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

include/configs/k2e_evm.h +0 -1

index 8d6471a..777f225 100644
@@ -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				\

include/configs/k2g_evm.h +0 -1

index a145445..2da0d8d 100644
@@ -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				\

include/configs/k2hk_evm.h +0 -1

index 913d454..4adb119 100644
@@ -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				\

include/configs/k2l_evm.h +0 -1

index 395e61c..9bdd565 100644
@@ -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				\

Signature · 1 line

2.10.1

Andrew F. Davis

author

2016-11-03 20:36 UTC #1 lore raw

PATCH 2/2 ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON

NFS loading support has been added to the default environment for most boot components, as PMMC and MON loading were added later they did not originally get the NFS commands added, add these now.

Signed-off-by Andrew F. Davis <[email protected]>

---
 include/configs/ti_armv7_keystone2.h | 3 +++
 1 file changed, 3 insertions(+)

include/configs/ti_armv7_keystone2.h +3 -0

index 7e365aa..cfb4b30 100644
@@ -220,6 +220,8 @@
 	"set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0"		\
 	"init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; "	\
 		"run set_rd_spec\0"					\
+	"init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; "	\
+		"run set_rd_spec\0"					\
 	"init_fw_rd_ramfs=setenv rd_spec -\0"				\
 	"init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; "	\
 		"run set_rd_spec\0"					\

@@ -228,6 +230,7 @@
 	"set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \
 	"dev_pmmc=0\0"							\
 	"get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0"	\
+	"get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc}\0"	\
 	"get_pmmc_ramfs=run get_pmmc_net\0"				\
 	"get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} "		\
 			"${bootdir}/${name_pmmc}\0"			\

Signature · 1 line

2.10.1

Lokesh Vutla

2016-11-04 04:28 UTC #2 lore raw

PATCH 2/2 ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON

Quoted 3 lines · Andrew F. Davis

NFS loading support has been added to the default environment for most boot components, as PMMC and MON loading were added later they did not originally get the NFS commands added, add these now.

Reviewed-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 28 lines

Signed-off-by Andrew F. Davis <[email protected]>

---
 include/configs/ti_armv7_keystone2.h | 3 +++
 1 file changed, 3 insertions(+)

include/configs/ti_armv7_keystone2.h +3 -0

index 7e365aa..cfb4b30 100644
@@ -220,6 +220,8 @@
 	"set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0"		\
 	"init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; "	\
 		"run set_rd_spec\0"					\
+	"init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; "	\
+		"run set_rd_spec\0"					\
 	"init_fw_rd_ramfs=setenv rd_spec -\0"				\
 	"init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; "	\
 		"run set_rd_spec\0"					\

@@ -228,6 +230,7 @@
 	"set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \
 	"dev_pmmc=0\0"							\
 	"get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0"	\
+	"get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc}\0"	\
 	"get_pmmc_ramfs=run get_pmmc_net\0"				\
 	"get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} "		\
 			"${bootdir}/${name_pmmc}\0"			\

Lokesh Vutla

2016-11-04 04:28 UTC #3 lore raw

PATCH 1/2 keystone2: Move target selection to Kconfig

In reply to Andrew F. Davis

Quoted 3 lines · Andrew F. Davis

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 <[email protected]>

Thanks and regards,
Lokesh

Quoted 113 lines

Signed-off-by Andrew F. Davis <[email protected]>

---
 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%)

arch/arm/mach-keystone/Makefile +2 -2

index b2ffe5b..8253a3b 100644
@@ -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

board/ti/ks2_evm/Makefile +17 ~~-17~~

dissimilarity index 66%
index 7ef2d2b..879f8b5 100644
@@ -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

include/configs/k2e_evm.h +0 -1

index 8d6471a..777f225 100644
@@ -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				\

include/configs/k2g_evm.h +0 -1

index a145445..2da0d8d 100644
@@ -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				\

include/configs/k2hk_evm.h +0 -1

index 913d454..4adb119 100644
@@ -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				\

include/configs/k2l_evm.h +0 -1

index 395e61c..9bdd565 100644
@@ -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				\