Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/tools/default_image.c b/tools/default_image.c
index 0a0792e503eadefe058f51db90c5fe98fcc2e1e2..e164c0c27d1a757e32e0c877d2abbfed787f3ca4 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Semihalf
  *
@@ -10,20 +11,23 @@
  *             some functions added to address abstraction
  *
  * All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #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;
 
 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;
@@ -53,9 +57,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 +69,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 +79,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 +90,10 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                struct image_tool_params *params)
 {
        uint32_t checksum;
+       time_t time;
+       uint32_t imagesize;
+       uint32_t ep;
+       uint32_t addr;
 
        image_header_t * hdr = (image_header_t *)ptr;
 
@@ -97,12 +102,29 @@ 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->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)
+                           + 0x2060 - sizeof(flash_header_v2_t);
+
+       else
+               imagesize = sbuf->st_size - sizeof(image_header_t);
+
+       if (params->os == IH_OS_TEE) {
+               addr = optee_image_get_load_addr(hdr);
+               ep = optee_image_get_entry_point(hdr);
+       }
+
        /* Build new header */
        image_set_magic(hdr, IH_MAGIC);
-       image_set_time(hdr, sbuf->st_mtime);
-       image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
-       image_set_load(hdr, params->addr);
-       image_set_ep(hdr, params->ep);
+       image_set_time(hdr, time);
+       image_set_size(hdr, imagesize);
+       image_set_load(hdr, addr);
+       image_set_ep(hdr, ep);
        image_set_dcrc(hdr, checksum);
        image_set_os(hdr, params->os);
        image_set_arch(hdr, params->arch);
@@ -117,33 +139,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
        image_set_hcrc(hdr, checksum);
 }
 
-static int image_save_datafile(struct image_tool_params *params,
-                              ulong file_data, ulong file_len)
-{
-       int dfd;
-       const char *datafile = params->outfile;
-
-       dfd = open(datafile, O_RDWR | O_CREAT | O_TRUNC | O_BINARY,
-                  S_IRUSR | S_IWUSR);
-       if (dfd < 0) {
-               fprintf(stderr, "%s: Can't open \"%s\": %s\n",
-                       params->cmdname, datafile, strerror(errno));
-               return -1;
-       }
-
-       if (write(dfd, (void *)file_data, file_len) != (ssize_t)file_len) {
-               fprintf(stderr, "%s: Write error on \"%s\": %s\n",
-                       params->cmdname, datafile, strerror(errno));
-               close(dfd);
-               return -1;
-       }
-
-       close(dfd);
-
-       return 0;
-}
-
-static int image_extract_datafile(void *ptr, struct image_tool_params *params)
+static int image_extract_subimage(void *ptr, struct image_tool_params *params)
 {
        const image_header_t *hdr = (const image_header_t *)ptr;
        ulong file_data;
@@ -170,25 +166,23 @@ static int image_extract_datafile(void *ptr, struct image_tool_params *params)
        }
 
        /* save the "data file" into the file system */
-       return image_save_datafile(params, file_data, file_len);
+       return imagetool_save_subimage(params->outfile, file_data, file_len);
 }
 
 /*
  * Default image type parameters definition
  */
-static struct image_type_params defimage_params = {
-       .name = "Default Image support",
-       .header_size = sizeof(image_header_t),
-       .hdr = (void*)&header,
-       .check_image_type = image_check_image_types,
-       .verify_header = image_verify_header,
-       .print_header = image_print_contents,
-       .set_header = image_set_header,
-       .extract_datafile = image_extract_datafile,
-       .check_params = image_check_params,
-};
-
-void init_default_image_type(void)
-{
-       register_image_type(&defimage_params);
-}
+U_BOOT_IMAGE_TYPE(
+       defimage,
+       "Default Image support",
+       sizeof(image_header_t),
+       (void *)&header,
+       image_check_params,
+       image_verify_header,
+       image_print_contents,
+       image_set_header,
+       image_extract_subimage,
+       image_check_image_types,
+       NULL,
+       NULL
+);