Merge git://git.denx.de/u-boot-socfpga

[u-boot] / tools / mkimage.c

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 28ff35e670a3e37ccce21cbe16f30a2959aa35d6..64ad131860b08c7b2d5d2e772c1e55095967be46 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Semihalf
  *
  * (C) Copyright 2000-2009
  * DENX Software Engineering
  * Wolfgang Denk, wd@denx.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include "mkimage.h"
@@ -301,6 +300,8 @@ static void process_args(int argc, char **argv)
                else if (!params.datafile)
                        usage("Missing data file for auto-FIT (use -d)");
        } else if (type != IH_TYPE_INVALID) {
+               if (type == IH_TYPE_SCRIPT && !params.datafile)
+                       usage("Missing data file for script (use -d)");
                params.type = type;
        }
 
@@ -588,9 +589,8 @@ int main(int argc, char **argv)
        if (tparams->print_header)
                tparams->print_header (ptr);
        else {
-               fprintf (stderr, "%s: Can't print header for %s: %s\n",
-                       params.cmdname, tparams->name, strerror(errno));
-               exit (EXIT_FAILURE);
+               fprintf (stderr, "%s: Can't print header for %s\n",
+                       params.cmdname, tparams->name);
        }
 
        (void) munmap((void *)ptr, sbuf.st_size);