X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=tools%2Fdefault_image.c;h=e164c0c27d1a757e32e0c877d2abbfed787f3ca4;hb=7f44c7e281ef228d60625f5acdcbe68a847256bd;hp=4abff4543a6c46b4016c0e4fabdfcdbfcd8a285a;hpb=e8f80a5a58c9b506453cc0780687e8ed457d30a6;p=oweals%2Fu-boot.git

diff --git a/tools/default_image.c b/tools/default_image.c
index 4abff4543a..e164c0c27d 100644
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -15,10 +15,12 @@
 
 #include "imagetool.h"
 #include "mkimage.h"
+#include <u-boot/crc.h>
 
 #include <image.h>
 #include <tee/optee.h>
 #include <u-boot/crc.h>
+#include <imximage.h>
 
 static image_header_t header;
 
@@ -100,13 +102,15 @@ 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);
+	time = imagetool_get_source_date(params->cmdname, sbuf->st_mtime);
 	ep = params->ep;
 	addr = params->addr;
 
 	if (params->type == IH_TYPE_FIRMWARE_IVT)
 		/* Add size of CSF minus IVT */
-		imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0;
+		imagesize = sbuf->st_size - sizeof(image_header_t)
+			    + 0x2060 - sizeof(flash_header_v2_t);
+
 	else
 		imagesize = sbuf->st_size - sizeof(image_header_t);