malta: Rename CONFIG_MALTA to CONFIG_TARGET_MALTA

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

diff --git a/tools/imagetool.c b/tools/imagetool.c
index b3e628f..f14ca2f 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -26,6 +26,12 @@ struct image_type_params *imagetool_get_type(int type)
        return NULL;
 }
 
+static int imagetool_verify_print_header_by_type(
+       void *ptr,
+       struct stat *sbuf,
+       struct image_type_params *tparams,
+       struct image_tool_params *params);
+
 int imagetool_verify_print_header(
        void *ptr,
        struct stat *sbuf,
@@ -39,6 +45,9 @@ int imagetool_verify_print_header(
        struct image_type_params **start = __start_image_type;
        struct image_type_params **end = __stop_image_type;
 
+       if (tparams)
+               return imagetool_verify_print_header_by_type(ptr, sbuf, tparams, params);
+
        for (curr = start; curr != end; curr++) {
                if ((*curr)->verify_header) {
                        retval = (*curr)->verify_header((unsigned char *)ptr,
@@ -46,7 +55,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 +74,44 @@ int imagetool_verify_print_header(
        return retval;
 }
 
+static int imagetool_verify_print_header_by_type(
+       void *ptr,
+       struct stat *sbuf,
+       struct image_type_params *tparams,
+       struct image_tool_params *params)
+{
+       int retval = -1;
+
+       if (tparams->verify_header) {
+               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);
+               }
+
+       } else {
+               fprintf(stderr, "%s: print_header undefined for %s\n",
+                       params->cmdname, tparams->name);
+       }
+
+       return retval;
+}
+
 int imagetool_save_subimage(
        const char *file_name,
        ulong file_data,