Merge branch '2020-05-01-master-imports'

[oweals/u-boot.git] / tools / default_image.c

diff --git a/tools/default_image.c b/tools/default_image.c
index 7a26232779807e187b713b02ad27582abb131bb5..e164c0c27d1a757e32e0c877d2abbfed787f3ca4 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -15,12 +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>
-#include <generated/autoconf.h>
 
 static image_header_t header;
 
@@ -109,7 +109,8 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
        if (params->type == IH_TYPE_FIRMWARE_IVT)
                /* Add size of CSF minus IVT */
                imagesize = sbuf->st_size - sizeof(image_header_t)
-                           + CONFIG_CSF_SIZE - sizeof(flash_header_v2_t);
+                           + 0x2060 - sizeof(flash_header_v2_t);
+
        else
                imagesize = sbuf->st_size - sizeof(image_header_t);