Skip to contentSkip to conversation

spl: fit: Fix support for loading FPGA bitstream

PATCH Superseded Marek Vasut 2 participants 2 messages May 31, 2018 – Jun 1, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spl: fit: Fix support for loading FPGA bitstream

Move the FPGA loading from IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP) conditional. The FPGA loading can be used without OS loading and GZIP support in SPL. This issue was most likely induced by some merge conflict, so fix it.

---
 common/spl/spl_fit.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
common/spl/spl_fit.c +5 -5
index 2321ebb0dd..255959d3a9 100644
@@ -185,16 +185,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
 	int ret;
 #endif
 
+	if (fit_image_get_type(fit, node, &type))
+		puts("Cannot get image type.\n");
+	else
+		debug("%s ", genimg_get_type_name(type));
+
 	if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) {
 		if (fit_image_get_comp(fit, node, &image_comp))
 			puts("Cannot get image compression format.\n");
 		else
 			debug("%s ", genimg_get_comp_name(image_comp));
-
-		if (fit_image_get_type(fit, node, &type))
-			puts("Cannot get image type.\n");
-		else
-			debug("%s ", genimg_get_type_name(type));
 	}
 
 	if (fit_image_get_load(fit, node, &load_addr))
Signature · 1 line
2.16.2
#1 lore raw

PATCH 1/1 spl: fit: Fix support for loading FPGA bitstream

Quoted 27 lines · Marek Vasut

Move the FPGA loading from IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP) conditional. The FPGA loading can be used without OS loading and GZIP support in SPL. This issue was most likely induced by some merge conflict, so fix it.

---
 common/spl/spl_fit.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
common/spl/spl_fit.c +5 -0
index 2321ebb0dd..255959d3a9 100644
@@ -185,16 +185,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
 	int ret;
 #endif
 
+	if (fit_image_get_type(fit, node, &type))
+		puts("Cannot get image type.\n");
+	else
+		debug("%s ", genimg_get_type_name(type));
+
 	if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) {
 		if (fit_image_get_comp(fit, node, &image_comp))
 			puts("Cannot get image compression format.\n");

common/spl/spl_fit.c static int spl_load_fit_image(struct spl_load_info *info, ulong sector, · line 200

Quoted 10 lines
common/spl/spl_fit.c +0 -5
 		else
 			debug("%s ", genimg_get_comp_name(image_comp));
-
-		if (fit_image_get_type(fit, node, &type))
-			puts("Cannot get image type.\n");
-		else
-			debug("%s ", genimg_get_type_name(type));
 	}
 
 	if (fit_image_get_load(fit, node, &load_addr))

Ah, ugh. That was my fault, but also because that move causes a number of platforms to break size constraints (much of Allwinner, iirc). You need to make your new change here depend on CONFIG_SPL_FPGA_SUPPORT || (CONFIG_SPL_OS_BOOT && CONFIG_SPL_GZIP) or so, and throw it though travis to make sure no platforms break. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180601/55203363/attachment.sig>