buildman: Move output-file setup into one place

[platform/kernel/u-boot.git] / tools / default_image.c

diff --git a/tools/default_image.c b/tools/default_image.c
index 4a067e6..0e49ab3 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -27,7 +27,8 @@ static struct legacy_img_hdr 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_FIRMWARE_IVT))
+           (type == IH_TYPE_KERNEL_NOLOAD) || (type == IH_TYPE_FIRMWARE_IVT) ||
+           (type == IH_TYPE_FDT_LEGACY))
                return EXIT_SUCCESS;
        else
                return EXIT_FAILURE;
@@ -40,6 +41,11 @@ static int image_check_params(struct image_tool_params *params)
                (params->lflag && (params->dflag || params->fflag)));
 }
 
+static void image_print_header(const void *ptr, struct image_tool_params *params)
+{
+       image_print_contents(ptr);
+}
+
 static int image_verify_header(unsigned char *ptr, int image_size,
                        struct image_tool_params *params)
 {
@@ -49,6 +55,12 @@ static int image_verify_header(unsigned char *ptr, int image_size,
        struct legacy_img_hdr header;
        struct legacy_img_hdr *hdr = &header;
 
+       if (image_size < sizeof(struct legacy_img_hdr)) {
+               debug("%s: Bad image size: \"%s\" is no valid image\n",
+                     params->cmdname, params->imagefile);
+               return -FDT_ERR_BADSTRUCTURE;
+       }
+
        /*
         * create copy of header so that we can blank out the
         * checksum field for checking - this can't be done
@@ -75,7 +87,17 @@ static int image_verify_header(unsigned char *ptr, int image_size,
        }
 
        data = (const unsigned char *)ptr + sizeof(struct legacy_img_hdr);
-       len  = image_size - sizeof(struct legacy_img_hdr);
+       len = image_get_data_size(hdr);
+
+       if (image_get_type(hdr) == IH_TYPE_FIRMWARE_IVT)
+               /* Add size of CSF minus IVT */
+               len -= 0x2060 - sizeof(flash_header_v2_t);
+
+       if (image_size - sizeof(struct legacy_img_hdr) < len) {
+               debug("%s: Bad image size: \"%s\" is no valid image\n",
+                     params->cmdname, params->imagefile);
+               return -FDT_ERR_BADSTRUCTURE;
+       }
 
        checksum = be32_to_cpu(hdr->ih_dcrc);
        if (crc32(0, data, len) != checksum) {
@@ -94,6 +116,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
        uint32_t imagesize;
        uint32_t ep;
        uint32_t addr;
+       int type;
        struct legacy_img_hdr *hdr = (struct legacy_img_hdr *)ptr;
 
        checksum = crc32(0,
@@ -113,6 +136,11 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
        else
                imagesize = sbuf->st_size - sizeof(struct legacy_img_hdr);
 
+       if (params->type == IH_TYPE_FDT_LEGACY)
+               type = IH_TYPE_FLATDT;
+       else
+               type = params->type;
+
        if (params->os == IH_OS_TEE) {
                addr = optee_image_get_load_addr(hdr);
                ep = optee_image_get_entry_point(hdr);
@@ -127,7 +155,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
        image_set_dcrc(hdr, checksum);
        image_set_os(hdr, params->os);
        image_set_arch(hdr, params->arch);
-       image_set_type(hdr, params->type);
+       image_set_type(hdr, type);
        image_set_comp(hdr, params->comp);
 
        image_set_name(hdr, params->imagename);
@@ -178,7 +206,7 @@ U_BOOT_IMAGE_TYPE(
        (void *)&header,
        image_check_params,
        image_verify_header,
-       image_print_contents,
+       image_print_header,
        image_set_header,
        image_extract_subimage,
        image_check_image_types,