| Message ID | 1523788656-4547-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | f3c326287e3e32f7ffcf2286462793a554b158c4 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] Revert "imximage: Remove failure when no IVT offset is found" | expand |
Hi Fabio, On 15/04/2018 12:37, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > 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> > --- > tools/imximage.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tools/imximage.c b/tools/imximage.c > index 6dabb13..5306699 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; > } You're very quick, thanks ! Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 15/04/2018 12:37, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > 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> > --- > tools/imximage.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tools/imximage.c b/tools/imximage.c > index 6dabb13..5306699 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; > } > > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/tools/imximage.c b/tools/imximage.c index 6dabb13..5306699 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; }