Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

[oweals/u-boot.git] / tools / imagetool.c

diff --git a/tools/imagetool.c b/tools/imagetool.c
index 4b0b73db5277a07629bc306156b37f12ae440d82..ba1f64aa377a7f048a987e952a3721f81c240b11 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
  *
  * Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include "imagetool.h"
@@ -47,11 +46,12 @@ int imagetool_verify_print_header(
 
                        if (retval == 0) {
                                /*
-                                * Print the image information  if verify is
+                                * Print the image information if verify is
                                 * successful
                                 */
                                if ((*curr)->print_header) {
-                                       (*curr)->print_header(ptr);
+                                       if (!params->quiet)
+                                               (*curr)->print_header(ptr);
                                } else {
                                        fprintf(stderr,
                                                "%s: print_header undefined for %s\n",
@@ -65,6 +65,38 @@ int imagetool_verify_print_header(
        return retval;
 }
 
+int imagetool_verify_print_header_by_type(
+       void *ptr,
+       struct stat *sbuf,
+       struct image_type_params *tparams,
+       struct image_tool_params *params)
+{
+       int retval;
+
+       retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size,
+                       params);
+
+       if (retval == 0) {
+               /*
+                * Print the image information if verify is successful
+                */
+               if (tparams->print_header) {
+                       if (!params->quiet)
+                               tparams->print_header(ptr);
+               } else {
+                       fprintf(stderr,
+                               "%s: print_header undefined for %s\n",
+                               params->cmdname, tparams->name);
+               }
+       } else {
+               fprintf(stderr,
+                       "%s: verify_header failed for %s with exit code %d\n",
+                       params->cmdname, tparams->name, retval);
+       }
+
+       return retval;
+}
+
 int imagetool_save_subimage(
        const char *file_name,
        ulong file_data,
@@ -91,3 +123,46 @@ int imagetool_save_subimage(
 
        return 0;
 }
+
+int imagetool_get_filesize(struct image_tool_params *params, const char *fname)
+{
+       struct stat sbuf;
+       int fd;
+
+       fd = open(fname, O_RDONLY | O_BINARY);
+       if (fd < 0) {
+               fprintf(stderr, "%s: Can't open %s: %s\n",
+                       params->cmdname, fname, strerror(errno));
+               return -1;
+       }
+
+       if (fstat(fd, &sbuf) < 0) {
+               fprintf(stderr, "%s: Can't stat %s: %s\n",
+                       params->cmdname, fname, strerror(errno));
+               close(fd);
+               return -1;
+       }
+       close(fd);
+
+       return sbuf.st_size;
+}
+
+time_t imagetool_get_source_date(
+        const char *cmdname,
+        time_t fallback)
+{
+       char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+
+       if (source_date_epoch == NULL)
+               return fallback;
+
+       time_t time = (time_t) strtol(source_date_epoch, NULL, 10);
+
+       if (gmtime(&time) == NULL) {
+               fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
+                       cmdname);
+               time = 0;
+       }
+
+       return time;
+}