Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / tools / imagetool.c

diff --git a/tools/imagetool.c b/tools/imagetool.c
index 351211cd5387b9e727ce22501428d2a6af19cc7b..855a096d0ab0f2579a07bcc60d662a9d8eaf2a22 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -51,7 +51,8 @@ int imagetool_verify_print_header(
                                 * 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",
@@ -107,9 +108,30 @@ int imagetool_get_filesize(struct image_tool_params *params, const char *fname)
        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(
+        struct image_tool_params *params,
+        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",
+                       params->cmdname);
+               time = 0;
+       }
+
+       return time;
+}