Merge tag 'dm-pull-30may20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

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

diff --git a/tools/imagetool.c b/tools/imagetool.c
index a4e39b24bca79bdd24adabdafd54d9b6be2f1a37..ba1f64aa377a7f048a987e952a3721f81c240b11 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -46,7 +46,7 @@ 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) {
@@ -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,
@@ -116,7 +148,7 @@ int imagetool_get_filesize(struct image_tool_params *params, const char *fname)
 }
 
 time_t imagetool_get_source_date(
-        struct image_tool_params *params,
+        const char *cmdname,
         time_t fallback)
 {
        char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
@@ -128,7 +160,7 @@ time_t imagetool_get_source_date(
 
        if (gmtime(&time) == NULL) {
                fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
-                       params->cmdname);
+                       cmdname);
                time = 0;
        }