]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - tools/omapimage.c
am33xx: Update DT files, add am335x_gp_evm_config target
[karo-tx-uboot.git] / tools / omapimage.c
index 5e739ac64758e0f13465f0b29f91d13822c4f6b5..7198b3330d6d6a62a8d3064643bfe1fe191cec33 100644 (file)
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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+
  */
 
-/* Required to obtain the getline prototype from stdio.h */
-#define _GNU_SOURCE
-
-#include "mkimage.h"
+#include "imagetool.h"
+#include <compiler.h>
 #include <image.h>
+#include "gpheader.h"
 #include "omapimage.h"
 
 /* Header size is CH header rounded up to 512 bytes plus GP header */
 #define OMAP_CH_HDR_SIZE 512
-#define OMAP_GP_HDR_SIZE (sizeof(struct gp_header))
-#define OMAP_FILE_HDR_SIZE (OMAP_CH_HDR_SIZE+OMAP_GP_HDR_SIZE)
+#define OMAP_FILE_HDR_SIZE (OMAP_CH_HDR_SIZE + GPIMAGE_HDR_SIZE)
+
+static int do_swap32 = 0;
 
 static uint8_t omapimage_header[OMAP_FILE_HDR_SIZE];
 
@@ -48,35 +32,11 @@ static int omapimage_check_image_types(uint8_t type)
 {
        if (type == IH_TYPE_OMAPIMAGE)
                return EXIT_SUCCESS;
-       else {
-               return EXIT_FAILURE;
-       }
-}
-
-/*
- * Only the simplest image type is currently supported:
- * TOC pointing to CHSETTINGS
- * TOC terminator
- * CHSETTINGS
- *
- * padding to OMAP_CH_HDR_SIZE bytes
- *
- * gp header
- *   size
- *   load_addr
- */
-static int valid_gph_size(uint32_t size)
-{
-       return size;
-}
-
-static int valid_gph_load_addr(uint32_t load_addr)
-{
-       return load_addr;
+       return EXIT_FAILURE;
 }
 
 static int omapimage_verify_header(unsigned char *ptr, int image_size,
-                       struct mkimage_params *params)
+                       struct image_tool_params *params)
 {
        struct ch_toc *toc = (struct ch_toc *)ptr;
        struct gp_header *gph = (struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
@@ -84,8 +44,13 @@ static int omapimage_verify_header(unsigned char *ptr, int image_size,
 
        while (toc->section_offset != 0xffffffff
                        && toc->section_size != 0xffffffff) {
-               offset = toc->section_offset;
-               size = toc->section_size;
+               if (do_swap32) {
+                       offset = cpu_to_be32(toc->section_offset);
+                       size = cpu_to_be32(toc->section_size);
+               } else {
+                       offset = toc->section_offset;
+                       size = toc->section_size;
+               }
                if (!offset || !size)
                        return -1;
                if (offset >= OMAP_CH_HDR_SIZE ||
@@ -93,12 +58,8 @@ static int omapimage_verify_header(unsigned char *ptr, int image_size,
                        return -1;
                toc++;
        }
-       if (!valid_gph_size(gph->size))
-               return -1;
-       if (!valid_gph_load_addr(gph->load_addr))
-               return -1;
 
-       return 0;
+       return gph_verify_header(gph, do_swap32);
 }
 
 static void omapimage_print_section(struct ch_settings *chs)
@@ -132,8 +93,13 @@ static void omapimage_print_header(const void *ptr)
 
        while (toc->section_offset != 0xffffffff
                        && toc->section_size != 0xffffffff) {
-               offset = toc->section_offset;
-               size = toc->section_size;
+               if (do_swap32) {
+                       offset = cpu_to_be32(toc->section_offset);
+                       size = cpu_to_be32(toc->section_size);
+               } else {
+                       offset = toc->section_offset;
+                       size = toc->section_size;
+               }
 
                if (offset >= OMAP_CH_HDR_SIZE ||
                    offset+size >= OMAP_CH_HDR_SIZE)
@@ -148,22 +114,7 @@ static void omapimage_print_header(const void *ptr)
                toc++;
        }
 
-       if (!valid_gph_size(gph->size)) {
-               fprintf(stderr,
-                       "Error: invalid image size %x\n",
-                       gph->size);
-               exit(EXIT_FAILURE);
-       }
-
-       if (!valid_gph_load_addr(gph->load_addr)) {
-               fprintf(stderr,
-                       "Error: invalid image load address %x\n",
-                       gph->size);
-               exit(EXIT_FAILURE);
-       }
-
-       printf("GP Header: Size %x LoadAddr %x\n",
-               gph->size, gph->load_addr);
+       gph_print_header(gph, do_swap32);
 }
 
 static int toc_offset(void *hdr, void *member)
@@ -172,7 +123,7 @@ static int toc_offset(void *hdr, void *member)
 }
 
 static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
-                               struct mkimage_params *params)
+                               struct image_tool_params *params)
 {
        struct ch_toc *toc = (struct ch_toc *)ptr;
        struct ch_settings *chs = (struct ch_settings *)
@@ -192,32 +143,36 @@ static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
        toc++;
        memset(toc, 0xff, sizeof(*toc));
 
-       gph->size = sbuf->st_size - OMAP_FILE_HDR_SIZE;
-       gph->load_addr = params->addr;
-}
+       gph_set_header(gph, sbuf->st_size - OMAP_FILE_HDR_SIZE,
+                      params->addr, 0);
 
-int omapimage_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));
+       if (strncmp(params->imagename, "byteswap", 8) == 0) {
+               do_swap32 = 1;
+               int swapped = 0;
+               uint32_t *data = (uint32_t *)ptr;
+
+               while (swapped <= (sbuf->st_size / sizeof(uint32_t))) {
+                       *data = cpu_to_be32(*data);
+                       swapped++;
+                       data++;
+               }
+       }
 }
 
 /*
  * omapimage parameters
  */
-static struct image_type_params omapimage_params = {
-       .name           = "TI OMAP CH/GP Boot Image support",
-       .header_size    = OMAP_FILE_HDR_SIZE,
-       .hdr            = (void *)&omapimage_header,
-       .check_image_type = omapimage_check_image_types,
-       .verify_header  = omapimage_verify_header,
-       .print_header   = omapimage_print_header,
-       .set_header     = omapimage_set_header,
-       .check_params   = omapimage_check_params,
-};
-
-void init_omap_image_type(void)
-{
-       mkimage_register(&omapimage_params);
-}
+U_BOOT_IMAGE_TYPE(
+       omapimage,
+       "TI OMAP CH/GP Boot Image support",
+       OMAP_FILE_HDR_SIZE,
+       (void *)&omapimage_header,
+       gpimage_check_params,
+       omapimage_verify_header,
+       omapimage_print_header,
+       omapimage_set_header,
+       NULL,
+       omapimage_check_image_types,
+       NULL,
+       NULL
+);