From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 15 Apr 2018 10:37:36 +0000 (-0300)
Subject: Revert "imximage: Remove failure when no IVT offset is found"
X-Git-Tag: v2018.05-rc3~1^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3c326287e3e32f7ffcf2286462793a554b158c4;p=u-boot

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

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 <fabio.estevam@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
---

diff --git a/tools/imximage.c b/tools/imximage.c
index 6f16d45351..14f80154d0 100644
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -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;
 }