Merge tag 'u-boot-imx-20230923' of https://source.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / tools / mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 5e0bb91..6dfe3e1 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -599,7 +599,7 @@ int main(int argc, char **argv)
                exit (retval);
        }
 
-       if ((params.type != IH_TYPE_MULTI) && (params.type != IH_TYPE_SCRIPT)) {
+       if (!params.skipcpy && params.type != IH_TYPE_MULTI && params.type != IH_TYPE_SCRIPT) {
                if (!params.datafile) {
                        fprintf(stderr, "%s: Option -d with image data file was not specified\n",
                                params.cmdname);
@@ -790,7 +790,7 @@ int main(int argc, char **argv)
 
        /* Print the image information by processing image header */
        if (tparams->print_header)
-               tparams->print_header (ptr);
+               tparams->print_header (ptr, &params);
        else {
                fprintf (stderr, "%s: Can't print header for %s\n",
                        params.cmdname, tparams->name);