From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Date: Wed, 8 May 2019 18:14:43 +0000 (+0100)
Subject: warp7: include: configs: Specify image name of bootscript in FIT
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=299ef26ec867e995f780136a23068745dc14bd1a;p=u-boot.git

warp7: include: configs: Specify image name of bootscript in FIT

When obtaining the bootscript from a FIT image we need to specify the name
of the bootscript as defined inside of the FIT.

This patch makes a define that appends a "bootscr" parameter to the source
command when compiling up in FIT mode on warp7.

An environment variable is supplied to enable others to use a different
name than "bootscr" as the image name of the boot script in their FIT.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 8ceaa0c6c6..f5449b0c79 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -27,9 +27,17 @@
 #define CONFIG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
 
+/* When booting with FIT specify the node entry containing boot.scr */
+#if defined(CONFIG_FIT)
+#define BOOT_SCR_STRING "source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
+#else
+#define BOOT_SCR_STRING "source ${bootscriptaddr}\0"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
+	"bootscr_fitimage_name=bootscr\0" \
 	"script_signed=boot.scr.imx-signed\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \