Skip to contentSkip to conversation

Revert "imximage: Remove failure when no IVT offset is found"

PATCH New Fabio Estevam 2 participants 3 messages Apr 15, 2018 – Apr 27, 2018 Arm i.MX and Layerscape

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 Revert "imximage: Remove failure when no IVT offset is found"

From: Fabio Estevam <[email protected]>

This reverts commit b5b0e4e351e20a606de22db6a56ad6bc1e2aa8fd.

Commit f916757300c1 ("imx: Create distinct pre-processed mkimage config files") provided a proper fix for the parallel mkimage config files build failure, so the original workaround can be safely reverted now.

Signed-off-by Fabio Estevam <[email protected]>
---
 tools/imximage.c | 5 +++++
 1 file changed, 5 insertions(+)
tools/imximage.c +5 -0
index 6dabb13..5306699 100644
@@ -777,6 +777,11 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
 	(*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
 	fclose(fd);
 
+	/* Exit if there is no BOOT_FROM field specifying the flash_offset */
+	if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+		fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+		exit(EXIT_FAILURE);
+	}
 	return dcd_len;
 }
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 Revert "imximage: Remove failure when no IVT offset is found"

Hi Fabio,

Quoted 19 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

This reverts commit b5b0e4e351e20a606de22db6a56ad6bc1e2aa8fd.

Commit f916757300c1 ("imx: Create distinct pre-processed mkimage config files") provided a proper fix for the parallel mkimage config files build failure, so the original workaround can be safely reverted now.

Signed-off-by Fabio Estevam <[email protected]>
---
 tools/imximage.c | 5 +++++
 1 file changed, 5 insertions(+)
tools/imximage.c +0 -0
index 6dabb13..5306699 100644

tools/imximage.c static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) · line 786

Quoted 10 lines
tools/imximage.c +5 -0
@@ -777,6 +777,11 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
 	(*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
 	fclose(fd);
 
+	/* Exit if there is no BOOT_FROM field specifying the flash_offset */
+	if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+		fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+		exit(EXIT_FAILURE);
+	}
 	return dcd_len;
 }

You're very quick, thanks !

Reviewed-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#2 lore raw

PATCH 1/1 Revert "imximage: Remove failure when no IVT offset is found"

In reply to Fabio Estevam
Quoted 21 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

This reverts commit b5b0e4e351e20a606de22db6a56ad6bc1e2aa8fd.

Commit f916757300c1 ("imx: Create distinct pre-processed mkimage config files") provided a proper fix for the parallel mkimage config files build failure, so the original workaround can be safely reverted now.

Signed-off-by Fabio Estevam <[email protected]>
---
 tools/imximage.c | 5 +++++
 1 file changed, 5 insertions(+)
tools/imximage.c +0 -0
index 6dabb13..5306699 100644
@@ -777,6 +777,11 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
 	(*set_dcd_rst)(imxhdr, dcd_len, name, lineno);

tools/imximage.c static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name) · line 787

Quoted 10 lines
tools/imximage.c +5 -0
 	fclose(fd);
 
+	/* Exit if there is no BOOT_FROM field specifying the flash_offset */
+	if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+		fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+		exit(EXIT_FAILURE);
+	}
 	return dcd_len;
 }

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================