fdt: Fix mkimage list to try every header type
PATCH v2 1/1 fdt: Fix mkimage list to try every header type
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
---
Changes in v2:
- Fix patch formatting to move commit message above the cut
tools/mkimage.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
tools/mkimage.c +15 -8
@@ -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, ¶ms); +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, ¶ms); + }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, ¶ms); + } (void )munmap ((void *)ptr, sbuf.st_size); (void )close (ifd);
Signature · 1 line
2.17.1
PATCH v2 1/1 fdt: Fix mkimage list to try every header type
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
---
Changes in v2:
- Fix patch formatting to move commit message above the cut
tools/mkimage.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
Applied to u-boot-dm, thanks!