[PATCH 04/20] scripts: imx-image: exit with error when barebox header conflicts with IVT

Sascha Hauer s.hauer at pengutronix.de
Tue Jun 23 09:15:50 EDT 2020


When the IVT is right at the beginning of the image it conflicts with
the barebox header. Bail out with an error when this happens.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 scripts/imx/imx-image.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index edff3580dd..bbd7e95bc2 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -984,6 +984,12 @@ int main(int argc, char *argv[])
 		       header_len - sizeof_bb_header);
 		xwrite(outfd, buf, header_len);
 	} else {
+		if (add_barebox_header &&
+		    data.image_dcd_offset + data.header_gap < sizeof_bb_header) {
+			fprintf(stderr, "barebox header conflicts with IVT\n");
+			exit(1);
+		}
+
 		xwrite(outfd, add_barebox_header ? bb_header : buf,
 		       sizeof_bb_header);
 
-- 
2.27.0




More information about the barebox mailing list