]> git.sur5r.net Git - u-boot/commitdiff
mkimage: Add OMAP boot image support
authorJohn Rigby <john.rigby@linaro.org>
Thu, 21 Jul 2011 13:10:30 +0000 (09:10 -0400)
committerU-Boot <uboot@aari01-12.(none)>
Wed, 3 Aug 2011 10:49:20 +0000 (12:49 +0200)
- Add mkimage support for OMAP boot image
- Add support for OMAP boot image(MLO) generation in the new
  SPL framework

Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
arch/arm/cpu/armv7/omap4/config.mk [new file with mode: 0644]
common/image.c
include/image.h
spl/Makefile
tools/Makefile
tools/mkimage.c
tools/mkimage.h
tools/omapimage.c [new file with mode: 0644]
tools/omapimage.h [new file with mode: 0644]

diff --git a/arch/arm/cpu/armv7/omap4/config.mk b/arch/arm/cpu/armv7/omap4/config.mk
new file mode 100644 (file)
index 0000000..b34fa64
--- /dev/null
@@ -0,0 +1,30 @@
+#
+# Copyright 2011 Linaro Limited
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# (C) Copyright 2010
+# Texas Instruments, <www.ti.com>
+#
+# Aneesh V <aneesh@ti.com>
+#
+# 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
+#
+ifdef CONFIG_SPL_BUILD
+ALL-y  += $(OBJTREE)/MLO
+else
+ALL-y  += $(obj)u-boot.img
+endif
index f1755410cdc401596857457343c80589f58ec663..5eea2a1f551d7cf5f753817ea8a1fb501359f26f 100644 (file)
@@ -130,11 +130,15 @@ static const table_entry_t uimage_os[] = {
 };
 
 static const table_entry_t uimage_type[] = {
-       {       IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
        {       IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",   },
        {       IH_TYPE_FIRMWARE,   "firmware",   "Firmware",           },
+       {       IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",   },
+       {       IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
+       {       IH_TYPE_IMXIMAGE,   "imximage",   "Freescale i.MX Boot Image",},
        {       IH_TYPE_KERNEL,     "kernel",     "Kernel Image",       },
+       {       IH_TYPE_KWBIMAGE,   "kwbimage",   "Kirkwood Boot Image",},
        {       IH_TYPE_MULTI,      "multi",      "Multi-File Image",   },
+       {       IH_TYPE_OMAPIMAGE,  "omapimage",  "TI OMAP SPL With GP CH",},
        {       IH_TYPE_RAMDISK,    "ramdisk",    "RAMDisk Image",      },
        {       IH_TYPE_SCRIPT,     "script",     "Script",             },
        {       IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
index 3c528a4aa88e6728f3653e780f6861c7fce4786f..352e4a042b8b7b383c96cddbbb08fe2c869fd8e2 100644 (file)
 #define IH_TYPE_KWBIMAGE       9       /* Kirkwood Boot Image          */
 #define IH_TYPE_IMXIMAGE       10      /* Freescale IMXBoot Image      */
 #define IH_TYPE_UBLIMAGE       11      /* Davinci UBL Image            */
+#define IH_TYPE_OMAPIMAGE      12      /* TI OMAP Config Header Image  */
 
 /*
  * Compression Types
index 0204f97349310a65789fb7f7ef2f373cba11cae4..87f13f600fcccc26d10307ff5812c1079e1933fb 100644 (file)
@@ -85,6 +85,12 @@ LDPPFLAGS += \
        $(shell $(LD) --version | \
          sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
 
+ifdef CONFIG_OMAP
+$(OBJTREE)/MLO:        $(obj)u-boot-spl.bin
+       $(OBJTREE)/tools/mkimage -T omapimage \
+               -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
+endif
+
 ALL-y  += $(obj)u-boot-spl.bin
 
 all:   $(ALL-y)
index e813e1dd56b8b782c86303cf2223afb4af1403a0..fc741d32d17341503926f10659fed56e6b754fd6 100644 (file)
@@ -88,6 +88,7 @@ OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 OBJ_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes.o
 NOPED_OBJ_FILES-y += kwbimage.o
 NOPED_OBJ_FILES-y += imximage.o
+NOPED_OBJ_FILES-y += omapimage.o
 NOPED_OBJ_FILES-y += mkimage.o
 OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
 NOPED_OBJ_FILES-y += os_support.o
@@ -192,6 +193,7 @@ $(obj)mkimage$(SFX):        $(obj)crc32.o \
                        $(obj)md5.o \
                        $(obj)mkimage.o \
                        $(obj)os_support.o \
+                       $(obj)omapimage.o \
                        $(obj)sha1.o \
                        $(obj)ublimage.o \
                        $(LIBFDT_OBJS)
index 7215d0f2ea97b6b4a0557c2a7d64672524142e7a..2f3310175489a2d55894b0d5a2c2252b233262d7 100644 (file)
@@ -156,6 +156,8 @@ main (int argc, char **argv)
        init_imx_image_type ();
        /* Init FIT image generation/list support */
        init_fit_image_type ();
+       /* Init TI OMAP Boot image generation/list support */
+       init_omap_image_type();
        /* Init Default image generation/list support */
        init_default_image_type ();
        /* Init Davinci UBL support */
index d109d403ff8744e50fe01a75d11ec39f1a604c15..e59a91913e305cfd977c805fde4886f117052006 100644 (file)
@@ -144,5 +144,6 @@ void init_imx_image_type (void);
 void init_default_image_type (void);
 void init_fit_image_type (void);
 void init_ubl_image_type(void);
+void init_omap_image_type(void);
 
 #endif /* _MKIIMAGE_H_ */
diff --git a/tools/omapimage.c b/tools/omapimage.c
new file mode 100644 (file)
index 0000000..29d91cc
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ * (C) Copyright 2010
+ * Linaro LTD, www.linaro.org
+ * Author: John Rigby <john.rigby@linaro.org>
+ * Based on TI's signGP.c
+ *
+ * (C) Copyright 2009
+ * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
+ *
+ * (C) Copyright 2008
+ * 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
+ */
+
+/* Required to obtain the getline prototype from stdio.h */
+#define _GNU_SOURCE
+
+#include "mkimage.h"
+#include <image.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)
+
+static uint8_t omapimage_header[OMAP_FILE_HDR_SIZE];
+
+static int omapimage_check_image_types(uint8_t type)
+{
+       if (type == IH_TYPE_OMAPIMAGE)
+               return EXIT_SUCCESS;
+       else {
+               fprintf(stderr, "Unknown OMAP image type - %x", type);
+               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;
+}
+
+static int omapimage_verify_header(unsigned char *ptr, int image_size,
+                       struct mkimage_params *params)
+{
+       struct ch_toc *toc = (struct ch_toc *)ptr;
+       struct gp_header *gph = (struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
+       uint32_t offset, size;
+
+       while (toc->section_offset != 0xffffffff
+                       && toc->section_size != 0xffffffff) {
+               offset = toc->section_offset;
+               size = toc->section_size;
+               if (!offset || !size)
+                       return -1;
+               if (offset >= OMAP_CH_HDR_SIZE ||
+                   offset+size >= OMAP_CH_HDR_SIZE)
+                       return -1;
+               toc++;
+       }
+       if (!valid_gph_size(gph->size))
+               return -1;
+       if (!valid_gph_load_addr(gph->load_addr))
+               return -1;
+
+       return 0;
+}
+
+static void omapimage_print_section(struct ch_settings *chs)
+{
+       const char *section_name;
+
+       if (chs->section_key)
+               section_name = "CHSETTINGS";
+       else
+               section_name = "UNKNOWNKEY";
+
+       printf("%s (%x) "
+               "valid:%x "
+               "version:%x "
+               "reserved:%x "
+               "flags:%x\n",
+               section_name,
+               chs->section_key,
+               chs->valid,
+               chs->version,
+               chs->reserved,
+               chs->flags);
+}
+
+static void omapimage_print_header(const void *ptr)
+{
+       const struct ch_toc *toc = (struct ch_toc *)ptr;
+       const struct gp_header *gph =
+                       (struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
+       uint32_t offset, size;
+
+       while (toc->section_offset != 0xffffffff
+                       && toc->section_size != 0xffffffff) {
+               offset = toc->section_offset;
+               size = toc->section_size;
+
+               if (offset >= OMAP_CH_HDR_SIZE ||
+                   offset+size >= OMAP_CH_HDR_SIZE)
+                       exit(EXIT_FAILURE);
+
+               printf("Section %s offset %x length %x\n",
+                       toc->section_name,
+                       toc->section_offset,
+                       toc->section_size);
+
+               omapimage_print_section((struct ch_settings *)(ptr+offset));
+               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);
+}
+
+static int toc_offset(void *hdr, void *member)
+{
+       return member - hdr;
+}
+
+static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
+                               struct mkimage_params *params)
+{
+       struct ch_toc *toc = (struct ch_toc *)ptr;
+       struct ch_settings *chs = (struct ch_settings *)
+                                       (ptr + 2 * sizeof(*toc));
+       struct gp_header *gph = (struct gp_header *)(ptr + OMAP_CH_HDR_SIZE);
+
+       toc->section_offset = toc_offset(ptr, chs);
+       toc->section_size = sizeof(struct ch_settings);
+       strcpy((char *)toc->section_name, "CHSETTINGS");
+
+       chs->section_key = KEY_CHSETTINGS;
+       chs->valid = 0;
+       chs->version = 1;
+       chs->reserved = 0;
+       chs->flags = 0;
+
+       toc++;
+       memset(toc, 0xff, sizeof(*toc));
+
+       gph->size = sbuf->st_size - OMAP_FILE_HDR_SIZE;
+       gph->load_addr = params->addr;
+}
+
+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));
+}
+
+/*
+ * 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);
+}
diff --git a/tools/omapimage.h b/tools/omapimage.h
new file mode 100644 (file)
index 0000000..719db00
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * (C) Copyright 2010
+ * Linaro LTD, www.linaro.org
+ * Author John Rigby <john.rigby@linaro.org>
+ * Based on TI's signGP.c
+ *
+ * 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
+ */
+
+#ifndef _OMAPIMAGE_H_
+#define _OMAPIMAGE_H_
+
+struct ch_toc {
+       uint32_t section_offset;
+       uint32_t section_size;
+       uint8_t unused[12];
+       uint8_t section_name[12];
+};
+
+struct ch_settings {
+       uint32_t section_key;
+       uint8_t valid;
+       uint8_t version;
+       uint16_t reserved;
+       uint32_t flags;
+};
+
+struct gp_header {
+       uint32_t size;
+       uint32_t load_addr;
+};
+
+#define KEY_CHSETTINGS 0xC0C0C0C1
+#endif /* _OMAPIMAGE_H_ */