tools: kwbimage: Set BOOT_FROM by default to SPI

[J-u-boot.git] / tools / fit_common.c

diff --git a/tools/fit_common.c b/tools/fit_common.c
index ee1767bd019a41482a924a9be07eed8ba61225ad..52b63296f8918c59f181b1d49d2371fc2b46a88b 100644 (file)
--- a/tools/fit_common.c
+++ b/tools/fit_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * DENX Software Engineering
@@ -14,8 +15,6 @@
  *             some functions added to address abstraction
  *
  * All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include "imagetool.h"
@@ -27,7 +26,11 @@
 int fit_verify_header(unsigned char *ptr, int image_size,
                        struct image_tool_params *params)
 {
-       return fdt_check_header(ptr);
+       if (fdt_check_header(ptr) != EXIT_SUCCESS ||
+           fit_check_format(ptr, IMAGE_SIZE_INVAL))
+               return EXIT_FAILURE;
+
+       return EXIT_SUCCESS;
 }
 
 int fit_check_image_types(uint8_t type)
@@ -38,49 +41,73 @@ int fit_check_image_types(uint8_t type)
                return EXIT_FAILURE;
 }
 
-int mmap_fdt(char *cmdname, const char *fname, void **blobp,
-               struct stat *sbuf, int useunlink)
+int mmap_fdt(const char *cmdname, const char *fname, size_t size_inc,
+            void **blobp, struct stat *sbuf, bool delete_on_error,
+            bool read_only)
 {
        void *ptr;
        int fd;
 
        /* Load FIT blob into memory (we need to write hashes/signatures) */
-       fd = open(fname, O_RDWR | O_BINARY);
+       fd = open(fname, (read_only ? O_RDONLY : O_RDWR) | O_BINARY);
 
        if (fd < 0) {
                fprintf(stderr, "%s: Can't open %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        if (fstat(fd, sbuf) < 0) {
                fprintf(stderr, "%s: Can't stat %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
+       }
+
+       if (size_inc) {
+               sbuf->st_size += size_inc;
+               if (ftruncate(fd, sbuf->st_size)) {
+                       fprintf(stderr, "%s: Can't expand %s: %s\n",
+                               cmdname, fname, strerror(errno));
+               goto err;
+               }
        }
 
        errno = 0;
-       ptr = mmap(0, sbuf->st_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+       ptr = mmap(0, sbuf->st_size,
+                  (read_only ? PROT_READ : PROT_READ | PROT_WRITE), MAP_SHARED,
+                  fd, 0);
        if ((ptr == MAP_FAILED) || (errno != 0)) {
                fprintf(stderr, "%s: Can't read %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        /* check if ptr has a valid blob */
        if (fdt_check_header(ptr)) {
                fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
+       }
+
+       /* expand if needed */
+       if (size_inc) {
+               int ret;
+
+               ret = fdt_open_into(ptr, ptr, sbuf->st_size);
+               if (ret) {
+                       fprintf(stderr, "%s: Cannot expand FDT: %s\n",
+                               cmdname, fdt_strerror(ret));
+                       goto err;
+               }
        }
 
        *blobp = ptr;
        return fd;
+
+err:
+       if (fd >= 0)
+               close(fd);
+       if (delete_on_error)
+               unlink(fname);
+
+       return -1;
 }