misc: add support for Qualcomm SMD protocol

[karo-tx-uboot.git] / tools / default_image.c

diff --git a/tools/default_image.c b/tools/default_image.c
index 2298f91624526929520512b2dd8771834a276f32..6e4ae14ec783d4e12693887aa166cdf514fc4d0d 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -15,6 +15,8 @@
  */
 
 #include "imagetool.h"
+#include "mkimage.h"
+
 #include <image.h>
 #include <u-boot/crc.h>
 
@@ -53,9 +55,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
        memcpy(hdr, ptr, sizeof(image_header_t));
 
        if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
-               fprintf(stderr,
-                       "%s: Bad Magic Number: \"%s\" is no valid image\n",
-                       params->cmdname, params->imagefile);
+               debug("%s: Bad Magic Number: \"%s\" is no valid image\n",
+                     params->cmdname, params->imagefile);
                return -FDT_ERR_BADMAGIC;
        }
 
@@ -66,9 +67,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
        hdr->ih_hcrc = cpu_to_be32(0);  /* clear for re-calculation */
 
        if (crc32(0, data, len) != checksum) {
-               fprintf(stderr,
-                       "%s: ERROR: \"%s\" has bad header checksum!\n",
-                       params->cmdname, params->imagefile);
+               debug("%s: ERROR: \"%s\" has bad header checksum!\n",
+                     params->cmdname, params->imagefile);
                return -FDT_ERR_BADSTATE;
        }
 
@@ -77,9 +77,8 @@ static int image_verify_header(unsigned char *ptr, int image_size,
 
        checksum = be32_to_cpu(hdr->ih_dcrc);
        if (crc32(0, data, len) != checksum) {
-               fprintf(stderr,
-                       "%s: ERROR: \"%s\" has corrupted data!\n",
-                       params->cmdname, params->imagefile);
+               debug("%s: ERROR: \"%s\" has corrupted data!\n",
+                     params->cmdname, params->imagefile);
                return -FDT_ERR_BADSTRUCTURE;
        }
        return 0;
@@ -89,6 +88,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                struct image_tool_params *params)
 {
        uint32_t checksum;
+       time_t time;
 
        image_header_t * hdr = (image_header_t *)ptr;
 
@@ -97,9 +97,11 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                sizeof(image_header_t)),
                        sbuf->st_size - sizeof(image_header_t));
 
+       time = imagetool_get_source_date(params, sbuf->st_mtime);
+
        /* Build new header */
        image_set_magic(hdr, IH_MAGIC);
-       image_set_time(hdr, sbuf->st_mtime);
+       image_set_time(hdr, time);
        image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
        image_set_load(hdr, params->addr);
        image_set_ep(hdr, params->ep);