* [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig
@ 2016-11-18 17:56 Andrew F. Davis
2016-11-18 17:56 ` [U-Boot] [PATCH v2 2/2] ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON Andrew F. Davis
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Andrew F. Davis @ 2016-11-18 17:56 UTC (permalink / raw)
To: u-boot
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>
---
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 7eaab87..2b359d6 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 71b0037..6cf4ba4 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 0256f0e..59ddb4d 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 2322ab2..86a55d7 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 \
--
2.10.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH v2 2/2] ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON
2016-11-18 17:56 [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
@ 2016-11-18 17:56 ` Andrew F. Davis
2016-11-29 1:03 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-11-18 17:57 ` [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
2016-11-29 1:03 ` [U-Boot] [U-Boot, v2, " Tom Rini
2 siblings, 1 reply; 5+ messages in thread
From: Andrew F. Davis @ 2016-11-18 17:56 UTC (permalink / raw)
To: u-boot
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 <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
---
include/configs/ti_armv7_keystone2.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 4aa262e..9533a97 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -226,6 +226,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" \
@@ -234,6 +236,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" \
--
2.10.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig
2016-11-18 17:56 [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
2016-11-18 17:56 ` [U-Boot] [PATCH v2 2/2] ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON Andrew F. Davis
@ 2016-11-18 17:57 ` Andrew F. Davis
2016-11-29 1:03 ` [U-Boot] [U-Boot, v2, " Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Andrew F. Davis @ 2016-11-18 17:57 UTC (permalink / raw)
To: u-boot
On 11/18/2016 11:56 AM, Andrew F. Davis wrote:
> 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>
> ---
Changes from v1:
- Fixed commit message
- Added Reviewed-by
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [U-Boot, v2, 1/2] keystone2: Move target selection to Kconfig
2016-11-18 17:56 [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
2016-11-18 17:56 ` [U-Boot] [PATCH v2 2/2] ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON Andrew F. Davis
2016-11-18 17:57 ` [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
@ 2016-11-29 1:03 ` Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2016-11-29 1:03 UTC (permalink / raw)
To: u-boot
On Fri, Nov 18, 2016 at 11:56:15AM -0600, Andrew F. Davis wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161128/062b2f3b/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-29 1:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-18 17:56 [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
2016-11-18 17:56 ` [U-Boot] [PATCH v2 2/2] ti_armv7_keystone2: env: Add NFS loading support for PMMC and MON Andrew F. Davis
2016-11-29 1:03 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-11-18 17:57 ` [U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig Andrew F. Davis
2016-11-29 1:03 ` [U-Boot] [U-Boot, v2, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox