ARM: dts: i.MX6QDL: icore-rqs: Fix eMMC detection during SPL

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

diff --git a/tools/default_image.c b/tools/default_image.c
index 18940af5b532a1a0e3c6e6d28dc027e48f05b836..4e5568e06a496fc6b43e865aee7d4093ce111c77 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -25,7 +25,7 @@ static image_header_t header;
 static int image_check_image_types(uint8_t type)
 {
        if (((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT)) ||
-           (type == IH_TYPE_KERNEL_NOLOAD))
+           (type == IH_TYPE_KERNEL_NOLOAD) || (type == IH_TYPE_FIRMWARE_IVT))
                return EXIT_SUCCESS;
        else
                return EXIT_FAILURE;
@@ -88,9 +88,8 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                struct image_tool_params *params)
 {
        uint32_t checksum;
-       char *source_date_epoch;
-       struct tm *time_universal;
        time_t time;
+       uint32_t imagesize;
 
        image_header_t * hdr = (image_header_t *)ptr;
 
@@ -99,26 +98,17 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                sizeof(image_header_t)),
                        sbuf->st_size - sizeof(image_header_t));
 
-       source_date_epoch = getenv("SOURCE_DATE_EPOCH");
-       if (source_date_epoch != NULL) {
-               time = (time_t) strtol(source_date_epoch, NULL, 10);
-
-               time_universal = gmtime(&time);
-               if (time_universal == NULL) {
-                       fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
-                               __func__);
-                       time = 0;
-               } else {
-                       time = mktime(time_universal);
-               }
-       } else {
-               time = sbuf->st_mtime;
-       }
+       time = imagetool_get_source_date(params, sbuf->st_mtime);
+       if (params->type == IH_TYPE_FIRMWARE_IVT)
+               /* Add size of CSF minus IVT */
+               imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0;
+       else
+               imagesize = sbuf->st_size - sizeof(image_header_t);
 
        /* Build new header */
        image_set_magic(hdr, IH_MAGIC);
        image_set_time(hdr, time);
-       image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
+       image_set_size(hdr, imagesize);
        image_set_load(hdr, params->addr);
        image_set_ep(hdr, params->ep);
        image_set_dcrc(hdr, checksum);