* [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found"
@ 2018-04-15 10:37 Fabio Estevam
2018-04-15 10:46 ` Stefano Babic
2018-04-27 8:51 ` Stefano Babic
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2018-04-15 10:37 UTC (permalink / raw)
To: u-boot
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;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found"
2018-04-15 10:37 [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found" Fabio Estevam
@ 2018-04-15 10:46 ` Stefano Babic
2018-04-27 8:51 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2018-04-15 10:46 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found"
2018-04-15 10:37 [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found" Fabio Estevam
2018-04-15 10:46 ` Stefano Babic
@ 2018-04-27 8:51 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2018-04-27 8:51 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-27 8:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-15 10:37 [U-Boot] [PATCH] Revert "imximage: Remove failure when no IVT offset is found" Fabio Estevam
2018-04-15 10:46 ` Stefano Babic
2018-04-27 8:51 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.