[U-Boot] [PATCH v1] fdt: Fix mkimage list to try every header type

* [U-Boot] [PATCH v1] fdt: Fix mkimage list to try every header type
@ 2019-04-09 17:36 Jordan Hand
  2019-04-09 20:54 ` [U-Boot] [U-Boot, " Vagrant Cascadian
  2019-04-10  8:52 ` [U-Boot] [PATCH " Alex Kiernan
  0 siblings, 2 replies; 4+ messages in thread
From: Jordan Hand @ 2019-04-09 17:36 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Jordan Hand <jorhand@microsoft.com>
---
Image type is not supplied to `mkimage -l`. For this reason, we cannot
use imagetool_verify_print_header_by_type. Instead, this patch uses
imagetool_verify_print_header to look through all header types to find
one where image validation succeeds.

This patch fixes failures in test/image/test-imagetools.sh

 tools/mkimage.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 2899adff81..d1e1a6743d 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -403,14 +403,21 @@ int main(int argc, char **argv)
 			exit (EXIT_FAILURE);
 		}
 
-		/*
-		 * scan through mkimage registry for all supported image types
-		 * and verify the input image file header for match
-		 * Print the image information for matched image type
-		 * Returns the error code if not matched
-		 */
-		retval = imagetool_verify_print_header_by_type(ptr, &sbuf,
-				tparams, &params);
+		if (params.fflag) {
+			/*
+			 * Verifies the header format based on the expected header for image
+			 * type in tparams
+			 */
+			retval = imagetool_verify_print_header_by_type(ptr, &sbuf,
+					tparams, &params);
+		} else {
+			/**
+			 * When listing the image, we are not given the image type. Simply check all
+			 * image types to find one that matches our header
+			 */
+			retval = imagetool_verify_print_header(ptr, &sbuf,
+					tparams, &params);
+		}
 
 		(void) munmap((void *)ptr, sbuf.st_size);
 		(void) close (ifd);
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread