Merge branch 'u-boot/master' into 'u-boot-arm/master'

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

diff --git a/tools/default_image.c b/tools/default_image.c
index f5bad4757dbb608eadc673105473046b6993f310..fd8b9f5f15420bd0a9bfb6d90cf12eafc23368d6 100644 (file)
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -11,20 +11,7 @@
  *
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include "mkimage.h"
@@ -33,22 +20,23 @@
 
 static image_header_t header;
 
-static int image_check_image_types (uint8_t type)
+static int image_check_image_types(uint8_t type)
 {
-       if ((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT))
+       if (((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT)) ||
+           (type == IH_TYPE_KERNEL_NOLOAD))
                return EXIT_SUCCESS;
        else
                return EXIT_FAILURE;
 }
 
-static int image_check_params (struct mkimage_params *params)
+static int image_check_params(struct mkimage_params *params)
 {
        return  ((params->dflag && (params->fflag || params->lflag)) ||
                (params->fflag && (params->dflag || params->lflag)) ||
                (params->lflag && (params->dflag || params->fflag)));
 }
 
-static int image_verify_header (unsigned char *ptr, int image_size,
+static int image_verify_header(unsigned char *ptr, int image_size,
                        struct mkimage_params *params)
 {
        uint32_t len;
@@ -62,10 +50,10 @@ static int image_verify_header (unsigned char *ptr, int image_size,
         * checksum field for checking - this can't be done
         * on the PROT_READ mapped data.
         */
-       memcpy (hdr, ptr, sizeof(image_header_t));
+       memcpy(hdr, ptr, sizeof(image_header_t));
 
        if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
-               fprintf (stderr,
+               fprintf(stderr,
                        "%s: Bad Magic Number: \"%s\" is no valid image\n",
                        params->cmdname, params->imagefile);
                return -FDT_ERR_BADMAGIC;
@@ -77,8 +65,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
        checksum = be32_to_cpu(hdr->ih_hcrc);
        hdr->ih_hcrc = cpu_to_be32(0);  /* clear for re-calculation */
 
-       if (crc32 (0, data, len) != checksum) {
-               fprintf (stderr,
+       if (crc32(0, data, len) != checksum) {
+               fprintf(stderr,
                        "%s: ERROR: \"%s\" has bad header checksum!\n",
                        params->cmdname, params->imagefile);
                return -FDT_ERR_BADSTATE;
@@ -88,8 +76,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
        len  = image_size - sizeof(image_header_t) ;
 
        checksum = be32_to_cpu(hdr->ih_dcrc);
-       if (crc32 (0, data, len) != checksum) {
-               fprintf (stderr,
+       if (crc32(0, data, len) != checksum) {
+               fprintf(stderr,
                        "%s: ERROR: \"%s\" has corrupted data!\n",
                        params->cmdname, params->imagefile);
                return -FDT_ERR_BADSTRUCTURE;
@@ -97,36 +85,36 @@ static int image_verify_header (unsigned char *ptr, int image_size,
        return 0;
 }
 
-static void image_set_header (void *ptr, struct stat *sbuf, int ifd,
+static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
                                struct mkimage_params *params)
 {
        uint32_t checksum;
 
        image_header_t * hdr = (image_header_t *)ptr;
 
-       checksum = crc32 (0,
+       checksum = crc32(0,
                        (const unsigned char *)(ptr +
                                sizeof(image_header_t)),
                        sbuf->st_size - sizeof(image_header_t));
 
        /* 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_dcrc (hdr, checksum);
-       image_set_os (hdr, params->os);
-       image_set_arch (hdr, params->arch);
-       image_set_type (hdr, params->type);
-       image_set_comp (hdr, params->comp);
-
-       image_set_name (hdr, params->imagename);
-
-       checksum = crc32 (0, (const unsigned char *)hdr,
+       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_dcrc(hdr, checksum);
+       image_set_os(hdr, params->os);
+       image_set_arch(hdr, params->arch);
+       image_set_type(hdr, params->type);
+       image_set_comp(hdr, params->comp);
+
+       image_set_name(hdr, params->imagename);
+
+       checksum = crc32(0, (const unsigned char *)hdr,
                                sizeof(image_header_t));
 
-       image_set_hcrc (hdr, checksum);
+       image_set_hcrc(hdr, checksum);
 }
 
 /*
@@ -143,7 +131,7 @@ static struct image_type_params defimage_params = {
        .check_params = image_check_params,
 };
 
-void init_default_image_type (void)
+void init_default_image_type(void)
 {
-       mkimage_register (&defimage_params);
+       mkimage_register(&defimage_params);
 }