]> git.sur5r.net Git - u-boot/commitdiff
Revert "imximage: Remove failure when no IVT offset is found"
authorFabio Estevam <fabio.estevam@nxp.com>
Sun, 15 Apr 2018 10:37:36 +0000 (07:37 -0300)
committerStefano Babic <sbabic@denx.de>
Thu, 26 Apr 2018 07:00:44 +0000 (09:00 +0200)
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>
tools/imximage.c

index 6f16d45351d443c7706b2412d0ebf0cb61460ae6..14f80154d0d7c2ec8bce98decb0d0a800fe4293b 100644 (file)
@@ -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;
 }