From: Pali Rohár <pali@kernel.org>
Date: Sat, 21 Jan 2023 19:05:43 +0000 (+0100)
Subject: tools: mkimage: Do not fill legacy_img_hdr for non-legacy XIP images
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-favicon.png?a=commitdiff_plain;h=27670acaac82f370b635f1af103594a335322bcf;p=u-boot.git

tools: mkimage: Do not fill legacy_img_hdr for non-legacy XIP images

Skip filling legacy_img_hdr structure for XIP images which do not use
legacy_img_hdr structure header. Adding unwanted header to other image
formats, like kwbimage cause generation of broken image.

Signed-off-by: Pali Rohár <pali@kernel.org>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index af7b0e09b3..0b342159e5 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -860,7 +860,9 @@ copy_file (int ifd, const char *datafile, int pad)
 		exit (EXIT_FAILURE);
 	}
 
-	if (params.xflag) {
+	if (params.xflag &&
+	    (((params.type > IH_TYPE_INVALID) && (params.type < IH_TYPE_FLATDT)) ||
+	     (params.type == IH_TYPE_KERNEL_NOLOAD) || (params.type == IH_TYPE_FIRMWARE_IVT))) {
 		unsigned char *p = NULL;
 		/*
 		 * XIP: do not append the struct legacy_img_hdr at the