]> git.sur5r.net Git - u-boot/blobdiff - tools/imximage.c
patman: add test for SPDX license
[u-boot] / tools / imximage.c
index 39f89c2b93eafa6f6a756535a5c39d0222175762..5f63bf875945b9b8ddc850a6cb0736cbe1413165 100644 (file)
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009
  * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
@@ -5,56 +6,92 @@
  * (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 "imagetool.h"
 #include <image.h>
 #include "imximage.h"
 
+#define UNDEFINED 0xFFFFFFFF
+
 /*
  * Supported commands for configuration file
  */
 static table_entry_t imximage_cmds[] = {
-       {CMD_BOOT_FROM,         "BOOT_FROM",            "boot command", },
-       {CMD_DATA,              "DATA",                 "Reg Write Data", },
-       {-1,            "",                     "",     },
+       {CMD_BOOT_FROM,         "BOOT_FROM",            "boot command",   },
+       {CMD_BOOT_OFFSET,       "BOOT_OFFSET",          "Boot offset",    },
+       {CMD_WRITE_DATA,        "DATA",                 "Reg Write Data", },
+       {CMD_WRITE_CLR_BIT,     "CLR_BIT",              "Reg clear bit",  },
+       {CMD_WRITE_SET_BIT,     "SET_BIT",              "Reg set bit",  },
+       {CMD_CHECK_BITS_SET,    "CHECK_BITS_SET",   "Reg Check bits set", },
+       {CMD_CHECK_BITS_CLR,    "CHECK_BITS_CLR",   "Reg Check bits clr", },
+       {CMD_CSF,               "CSF",           "Command Sequence File", },
+       {CMD_IMAGE_VERSION,     "IMAGE_VERSION",        "image version",  },
+       {CMD_PLUGIN,            "PLUGIN",               "file plugin_addr",  },
+       {-1,                    "",                     "",               },
 };
 
 /*
  * Supported Boot options for configuration file
  * this is needed to set the correct flash offset
  */
-static table_entry_t imximage_bootops[] = {
-       {FLASH_OFFSET_SPI,      "spi",          "SPI Flash",    },
+static table_entry_t imximage_boot_offset[] = {
+       {FLASH_OFFSET_ONENAND,  "onenand",      "OneNAND Flash",},
        {FLASH_OFFSET_NAND,     "nand",         "NAND Flash",   },
+       {FLASH_OFFSET_NOR,      "nor",          "NOR Flash",    },
+       {FLASH_OFFSET_SATA,     "sata",         "SATA Disk",    },
        {FLASH_OFFSET_SD,       "sd",           "SD Card",      },
-       {FLASH_OFFSET_ONENAND,  "onenand",      "OneNAND Flash",},
+       {FLASH_OFFSET_SPI,      "spi",          "SPI Flash",    },
+       {FLASH_OFFSET_QSPI,     "qspi",         "QSPI NOR Flash",},
        {-1,                    "",             "Invalid",      },
 };
 
+/*
+ * Supported Boot options for configuration file
+ * this is needed to determine the initial load size
+ */
+static table_entry_t imximage_boot_loadsize[] = {
+       {FLASH_LOADSIZE_ONENAND,        "onenand",      "OneNAND Flash",},
+       {FLASH_LOADSIZE_NAND,           "nand",         "NAND Flash",   },
+       {FLASH_LOADSIZE_NOR,            "nor",          "NOR Flash",    },
+       {FLASH_LOADSIZE_SATA,           "sata",         "SATA Disk",    },
+       {FLASH_LOADSIZE_SD,             "sd",           "SD Card",      },
+       {FLASH_LOADSIZE_SPI,            "spi",          "SPI Flash",    },
+       {FLASH_LOADSIZE_QSPI,           "qspi",         "QSPI NOR Flash",},
+       {-1,                            "",             "Invalid",      },
+};
+
+/*
+ * IMXIMAGE version definition for i.MX chips
+ */
+static table_entry_t imximage_versions[] = {
+       {IMXIMAGE_V1,   "",     " (i.MX25/35/51 compatible)", },
+       {IMXIMAGE_V2,   "",     " (i.MX53/6/7 compatible)",   },
+       {-1,            "",     " (Invalid)",                 },
+};
 
 static struct imx_header imximage_header;
+static uint32_t imximage_version;
+/*
+ * Image Vector Table Offset
+ * Initialized to a wrong not 4-bytes aligned address to
+ * check if it is was set by the cfg file.
+ */
+static uint32_t imximage_ivt_offset = UNDEFINED;
+static uint32_t imximage_csf_size = UNDEFINED;
+/* Initial Load Region Size */
+static uint32_t imximage_init_loadsize;
+static uint32_t imximage_iram_free_start;
+static uint32_t imximage_plugin_size;
+static uint32_t plugin_image;
+
+static set_dcd_val_t set_dcd_val;
+static set_dcd_param_t set_dcd_param;
+static set_dcd_rst_t set_dcd_rst;
+static set_imx_hdr_t set_imx_hdr;
+static uint32_t max_dcd_entries;
+static uint32_t *header_size_ptr;
+static uint32_t *csf_ptr;
 
 static uint32_t get_cfg_value(char *token, char *name,  int linenr)
 {
@@ -71,67 +108,635 @@ static uint32_t get_cfg_value(char *token, char *name,  int linenr)
        return value;
 }
 
-static int imximage_check_image_types(uint8_t type)
+static uint32_t detect_imximage_version(struct imx_header *imx_hdr)
 {
-       if (type == IH_TYPE_IMXIMAGE)
-               return EXIT_SUCCESS;
-       else
-               return EXIT_FAILURE;
+       imx_header_v1_t *hdr_v1 = &imx_hdr->header.hdr_v1;
+       imx_header_v2_t *hdr_v2 = &imx_hdr->header.hdr_v2;
+       flash_header_v1_t *fhdr_v1 = &hdr_v1->fhdr;
+       flash_header_v2_t *fhdr_v2 = &hdr_v2->fhdr;
+
+       /* Try to detect V1 */
+       if ((fhdr_v1->app_code_barker == APP_CODE_BARKER) &&
+               (hdr_v1->dcd_table.preamble.barker == DCD_BARKER))
+               return IMXIMAGE_V1;
+
+       /* Try to detect V2 */
+       if ((fhdr_v2->header.tag == IVT_HEADER_TAG) &&
+               (hdr_v2->data.dcd_table.header.tag == DCD_HEADER_TAG))
+               return IMXIMAGE_V2;
+
+       if ((fhdr_v2->header.tag == IVT_HEADER_TAG) &&
+           hdr_v2->boot_data.plugin)
+               return IMXIMAGE_V2;
+
+       return IMXIMAGE_VER_INVALID;
 }
 
-static int imximage_verify_header(unsigned char *ptr, int image_size,
-                       struct mkimage_params *params)
+static void err_imximage_version(int version)
 {
+       fprintf(stderr,
+               "Error: Unsupported imximage version:%d\n", version);
 
-       struct imx_header *imx_hdr = (struct imx_header *) ptr;
-       flash_header_t *hdr = &imx_hdr->fhdr;
+       exit(EXIT_FAILURE);
+}
 
-       /* Only a few checks can be done: search for magic numbers */
-       if (hdr->app_code_barker != APP_CODE_BARKER)
-               return -FDT_ERR_BADSTRUCTURE;
+static void set_dcd_val_v1(struct imx_header *imxhdr, char *name, int lineno,
+                                       int fld, uint32_t value, uint32_t off)
+{
+       dcd_v1_t *dcd_v1 = &imxhdr->header.hdr_v1.dcd_table;
+
+       switch (fld) {
+       case CFG_REG_SIZE:
+               /* Byte, halfword, word */
+               if ((value != 1) && (value != 2) && (value != 4)) {
+                       fprintf(stderr, "Error: %s[%d] - "
+                               "Invalid register size " "(%d)\n",
+                               name, lineno, value);
+                       exit(EXIT_FAILURE);
+               }
+               dcd_v1->addr_data[off].type = value;
+               break;
+       case CFG_REG_ADDRESS:
+               dcd_v1->addr_data[off].addr = value;
+               break;
+       case CFG_REG_VALUE:
+               dcd_v1->addr_data[off].value = value;
+               break;
+       default:
+               break;
 
-       if (imx_hdr->dcd_table.preamble.barker != DCD_BARKER)
-               return -FDT_ERR_BADSTRUCTURE;
+       }
+}
 
-       return 0;
+static struct dcd_v2_cmd *gd_last_cmd;
+
+static void set_dcd_param_v2(struct imx_header *imxhdr, uint32_t dcd_len,
+               int32_t cmd)
+{
+       dcd_v2_t *dcd_v2 = &imxhdr->header.hdr_v2.data.dcd_table;
+       struct dcd_v2_cmd *d = gd_last_cmd;
+       struct dcd_v2_cmd *d2;
+       int len;
+
+       if (!d)
+               d = &dcd_v2->dcd_cmd;
+       d2 = d;
+       len = be16_to_cpu(d->write_dcd_command.length);
+       if (len > 4)
+               d2 = (struct dcd_v2_cmd *)(((char *)d) + len);
+
+       switch (cmd) {
+       case CMD_WRITE_DATA:
+               if ((d->write_dcd_command.tag == DCD_WRITE_DATA_COMMAND_TAG) &&
+                   (d->write_dcd_command.param == DCD_WRITE_DATA_PARAM))
+                       break;
+               d = d2;
+               d->write_dcd_command.tag = DCD_WRITE_DATA_COMMAND_TAG;
+               d->write_dcd_command.length = cpu_to_be16(4);
+               d->write_dcd_command.param = DCD_WRITE_DATA_PARAM;
+               break;
+       case CMD_WRITE_CLR_BIT:
+               if ((d->write_dcd_command.tag == DCD_WRITE_DATA_COMMAND_TAG) &&
+                   (d->write_dcd_command.param == DCD_WRITE_CLR_BIT_PARAM))
+                       break;
+               d = d2;
+               d->write_dcd_command.tag = DCD_WRITE_DATA_COMMAND_TAG;
+               d->write_dcd_command.length = cpu_to_be16(4);
+               d->write_dcd_command.param = DCD_WRITE_CLR_BIT_PARAM;
+               break;
+       case CMD_WRITE_SET_BIT:
+               if ((d->write_dcd_command.tag == DCD_WRITE_DATA_COMMAND_TAG) &&
+                   (d->write_dcd_command.param == DCD_WRITE_SET_BIT_PARAM))
+                       break;
+               d = d2;
+               d->write_dcd_command.tag = DCD_WRITE_DATA_COMMAND_TAG;
+               d->write_dcd_command.length = cpu_to_be16(4);
+               d->write_dcd_command.param = DCD_WRITE_SET_BIT_PARAM;
+               break;
+       /*
+        * Check data command only supports one entry,
+        */
+       case CMD_CHECK_BITS_SET:
+               d = d2;
+               d->write_dcd_command.tag = DCD_CHECK_DATA_COMMAND_TAG;
+               d->write_dcd_command.length = cpu_to_be16(4);
+               d->write_dcd_command.param = DCD_CHECK_BITS_SET_PARAM;
+               break;
+       case CMD_CHECK_BITS_CLR:
+               d = d2;
+               d->write_dcd_command.tag = DCD_CHECK_DATA_COMMAND_TAG;
+               d->write_dcd_command.length = cpu_to_be16(4);
+               d->write_dcd_command.param = DCD_CHECK_BITS_CLR_PARAM;
+               break;
+       default:
+               break;
+       }
+       gd_last_cmd = d;
 }
 
-static void imximage_print_header(const void *ptr)
+static void set_dcd_val_v2(struct imx_header *imxhdr, char *name, int lineno,
+                                       int fld, uint32_t value, uint32_t off)
 {
-       struct imx_header *imx_hdr = (struct imx_header *) ptr;
-       flash_header_t *hdr = &imx_hdr->fhdr;
-       uint32_t size;
-       uint32_t length;
-       dcd_t *dcd = &imx_hdr->dcd_table;
+       struct dcd_v2_cmd *d = gd_last_cmd;
+       int len;
+
+       len = be16_to_cpu(d->write_dcd_command.length);
+       off = (len - 4) >> 3;
+
+       switch (fld) {
+       case CFG_REG_ADDRESS:
+               d->addr_data[off].addr = cpu_to_be32(value);
+               break;
+       case CFG_REG_VALUE:
+               d->addr_data[off].value = cpu_to_be32(value);
+               off++;
+               d->write_dcd_command.length = cpu_to_be16((off << 3) + 4);
+               break;
+       default:
+               break;
+
+       }
+}
+
+/*
+ * Complete setting up the rest field of DCD of V1
+ * such as barker code and DCD data length.
+ */
+static void set_dcd_rst_v1(struct imx_header *imxhdr, uint32_t dcd_len,
+                                               char *name, int lineno)
+{
+       dcd_v1_t *dcd_v1 = &imxhdr->header.hdr_v1.dcd_table;
+
+       dcd_v1->preamble.barker = DCD_BARKER;
+       dcd_v1->preamble.length = dcd_len * sizeof(dcd_type_addr_data_t);
+}
+
+/*
+ * Complete setting up the reset field of DCD of V2
+ * such as DCD tag, version, length, etc.
+ */
+static void set_dcd_rst_v2(struct imx_header *imxhdr, uint32_t dcd_len,
+                                               char *name, int lineno)
+{
+       if (!imxhdr->header.hdr_v2.boot_data.plugin) {
+               dcd_v2_t *dcd_v2 = &imxhdr->header.hdr_v2.data.dcd_table;
+               struct dcd_v2_cmd *d = gd_last_cmd;
+               int len;
+
+               if (!d)
+                       d = &dcd_v2->dcd_cmd;
+               len = be16_to_cpu(d->write_dcd_command.length);
+               if (len > 4)
+                       d = (struct dcd_v2_cmd *)(((char *)d) + len);
+
+               len = (char *)d - (char *)&dcd_v2->header;
+               dcd_v2->header.tag = DCD_HEADER_TAG;
+               dcd_v2->header.length = cpu_to_be16(len);
+               dcd_v2->header.version = DCD_VERSION;
+       }
+}
+
+static void set_imx_hdr_v1(struct imx_header *imxhdr, uint32_t dcd_len,
+               uint32_t entry_point, uint32_t flash_offset)
+{
+       imx_header_v1_t *hdr_v1 = &imxhdr->header.hdr_v1;
+       flash_header_v1_t *fhdr_v1 = &hdr_v1->fhdr;
+       dcd_v1_t *dcd_v1 = &hdr_v1->dcd_table;
+       uint32_t hdr_base;
+       uint32_t header_length = (((char *)&dcd_v1->addr_data[dcd_len].addr)
+                       - ((char *)imxhdr));
+
+       /* Set magic number */
+       fhdr_v1->app_code_barker = APP_CODE_BARKER;
+
+       hdr_base = entry_point - imximage_init_loadsize + flash_offset;
+       fhdr_v1->app_dest_ptr = hdr_base - flash_offset;
+       fhdr_v1->app_code_jump_vector = entry_point;
+
+       fhdr_v1->dcd_ptr_ptr = hdr_base + offsetof(flash_header_v1_t, dcd_ptr);
+       fhdr_v1->dcd_ptr = hdr_base + offsetof(imx_header_v1_t, dcd_table);
+
+       /* Security feature are not supported */
+       fhdr_v1->app_code_csf = 0;
+       fhdr_v1->super_root_key = 0;
+       header_size_ptr = (uint32_t *)(((char *)imxhdr) + header_length - 4);
+}
+
+static void set_imx_hdr_v2(struct imx_header *imxhdr, uint32_t dcd_len,
+               uint32_t entry_point, uint32_t flash_offset)
+{
+       imx_header_v2_t *hdr_v2 = &imxhdr->header.hdr_v2;
+       flash_header_v2_t *fhdr_v2 = &hdr_v2->fhdr;
+       uint32_t hdr_base;
+
+       /* Set magic number */
+       fhdr_v2->header.tag = IVT_HEADER_TAG; /* 0xD1 */
+       fhdr_v2->header.length = cpu_to_be16(sizeof(flash_header_v2_t));
+       fhdr_v2->header.version = IVT_VERSION; /* 0x40 */
+
+       if (!hdr_v2->boot_data.plugin) {
+               fhdr_v2->entry = entry_point;
+               fhdr_v2->reserved1 = 0;
+               fhdr_v2->reserved1 = 0;
+               hdr_base = entry_point - imximage_init_loadsize +
+                       flash_offset;
+               fhdr_v2->self = hdr_base;
+               if (dcd_len > 0)
+                       fhdr_v2->dcd_ptr = hdr_base +
+                               offsetof(imx_header_v2_t, data);
+               else
+                       fhdr_v2->dcd_ptr = 0;
+               fhdr_v2->boot_data_ptr = hdr_base
+                               + offsetof(imx_header_v2_t, boot_data);
+               hdr_v2->boot_data.start = entry_point - imximage_init_loadsize;
+
+               fhdr_v2->csf = 0;
+
+               header_size_ptr = &hdr_v2->boot_data.size;
+               csf_ptr = &fhdr_v2->csf;
+       } else {
+               imx_header_v2_t *next_hdr_v2;
+               flash_header_v2_t *next_fhdr_v2;
+
+               if (imximage_csf_size != 0) {
+                       fprintf(stderr, "Error: Header v2: SECURE_BOOT is only supported in DCD mode!");
+                       exit(EXIT_FAILURE);
+               }
+
+               fhdr_v2->entry = imximage_iram_free_start +
+                       flash_offset + sizeof(flash_header_v2_t) +
+                       sizeof(boot_data_t);
+
+               fhdr_v2->reserved1 = 0;
+               fhdr_v2->reserved2 = 0;
+               fhdr_v2->self = imximage_iram_free_start + flash_offset;
+
+               fhdr_v2->dcd_ptr = 0;
+
+               fhdr_v2->boot_data_ptr = fhdr_v2->self +
+                               offsetof(imx_header_v2_t, boot_data);
+
+               hdr_v2->boot_data.start = imximage_iram_free_start;
+               /*
+                * The actural size of plugin image is "imximage_plugin_size +
+                * sizeof(flash_header_v2_t) + sizeof(boot_data_t)", plus the
+                * flash_offset space.The ROM code only need to copy this size
+                * to run the plugin code. However, later when copy the whole
+                * U-Boot image to DDR, the ROM code use memcpy to copy the
+                * first part of the image, and use the storage read function
+                * to get the remaining part. This requires the dividing point
+                * must be multiple of storage sector size. Here we set the
+                * first section to be MAX_PLUGIN_CODE_SIZE(64KB) for this
+                * purpose.
+                */
+               hdr_v2->boot_data.size = MAX_PLUGIN_CODE_SIZE;
+
+               /* Security feature are not supported */
+               fhdr_v2->csf = 0;
+
+               next_hdr_v2 = (imx_header_v2_t *)((char *)hdr_v2 +
+                              imximage_plugin_size);
+
+               next_fhdr_v2 = &next_hdr_v2->fhdr;
+
+               next_fhdr_v2->header.tag = IVT_HEADER_TAG; /* 0xD1 */
+               next_fhdr_v2->header.length =
+                       cpu_to_be16(sizeof(flash_header_v2_t));
+               next_fhdr_v2->header.version = IVT_VERSION; /* 0x40 */
+
+               next_fhdr_v2->entry = entry_point;
+               hdr_base = entry_point - sizeof(struct imx_header);
+               next_fhdr_v2->reserved1 = 0;
+               next_fhdr_v2->reserved2 = 0;
+               next_fhdr_v2->self = hdr_base + imximage_plugin_size;
+
+               next_fhdr_v2->dcd_ptr = 0;
+               next_fhdr_v2->boot_data_ptr = next_fhdr_v2->self +
+                               offsetof(imx_header_v2_t, boot_data);
+
+               next_hdr_v2->boot_data.start = hdr_base - flash_offset;
+
+               header_size_ptr = &next_hdr_v2->boot_data.size;
 
-       size = imx_hdr->dcd_table.preamble.length;
-       if (size > (MAX_HW_CFG_SIZE * sizeof(dcd_type_addr_data_t))) {
+               next_hdr_v2->boot_data.plugin = 0;
+
+               next_fhdr_v2->csf = 0;
+       }
+}
+
+static void set_hdr_func(void)
+{
+       switch (imximage_version) {
+       case IMXIMAGE_V1:
+               set_dcd_val = set_dcd_val_v1;
+               set_dcd_param = NULL;
+               set_dcd_rst = set_dcd_rst_v1;
+               set_imx_hdr = set_imx_hdr_v1;
+               max_dcd_entries = MAX_HW_CFG_SIZE_V1;
+               break;
+       case IMXIMAGE_V2:
+               gd_last_cmd = NULL;
+               set_dcd_val = set_dcd_val_v2;
+               set_dcd_param = set_dcd_param_v2;
+               set_dcd_rst = set_dcd_rst_v2;
+               set_imx_hdr = set_imx_hdr_v2;
+               max_dcd_entries = MAX_HW_CFG_SIZE_V2;
+               break;
+       default:
+               err_imximage_version(imximage_version);
+               break;
+       }
+}
+
+static void print_hdr_v1(struct imx_header *imx_hdr)
+{
+       imx_header_v1_t *hdr_v1 = &imx_hdr->header.hdr_v1;
+       flash_header_v1_t *fhdr_v1 = &hdr_v1->fhdr;
+       dcd_v1_t *dcd_v1 = &hdr_v1->dcd_table;
+       uint32_t size, length, ver;
+
+       size = dcd_v1->preamble.length;
+       if (size > (MAX_HW_CFG_SIZE_V1 * sizeof(dcd_type_addr_data_t))) {
                fprintf(stderr,
                        "Error: Image corrupt DCD size %d exceed maximum %d\n",
                        (uint32_t)(size / sizeof(dcd_type_addr_data_t)),
-                       MAX_HW_CFG_SIZE);
+                       MAX_HW_CFG_SIZE_V1);
                exit(EXIT_FAILURE);
        }
 
-       length =  dcd->preamble.length / sizeof(dcd_type_addr_data_t);
+       length = dcd_v1->preamble.length / sizeof(dcd_type_addr_data_t);
+       ver = detect_imximage_version(imx_hdr);
 
        printf("Image Type:   Freescale IMX Boot Image\n");
+       printf("Image Ver:    %x", ver);
+       printf("%s\n", get_table_entry_name(imximage_versions, NULL, ver));
        printf("Data Size:    ");
-       genimg_print_size(dcd->addr_data[length].type);
-       printf("Load Address: %08x\n", (unsigned int)hdr->app_dest_ptr);
-       printf("Entry Point:  %08x\n", (unsigned int)hdr->app_code_jump_vector);
+       genimg_print_size(dcd_v1->addr_data[length].type);
+       printf("Load Address: %08x\n", (uint32_t)fhdr_v1->app_dest_ptr);
+       printf("Entry Point:  %08x\n", (uint32_t)fhdr_v1->app_code_jump_vector);
+}
+
+static void print_hdr_v2(struct imx_header *imx_hdr)
+{
+       imx_header_v2_t *hdr_v2 = &imx_hdr->header.hdr_v2;
+       flash_header_v2_t *fhdr_v2 = &hdr_v2->fhdr;
+       dcd_v2_t *dcd_v2 = &hdr_v2->data.dcd_table;
+       uint32_t size, version, plugin;
+
+       plugin = hdr_v2->boot_data.plugin;
+       if (!plugin) {
+               size = be16_to_cpu(dcd_v2->header.length);
+               if (size > (MAX_HW_CFG_SIZE_V2 * sizeof(dcd_addr_data_t))) {
+                       fprintf(stderr,
+                               "Error: Image corrupt DCD size %d exceed maximum %d\n",
+                               (uint32_t)(size / sizeof(dcd_addr_data_t)),
+                               MAX_HW_CFG_SIZE_V2);
+                       exit(EXIT_FAILURE);
+               }
+       }
+
+       version = detect_imximage_version(imx_hdr);
+
+       printf("Image Type:   Freescale IMX Boot Image\n");
+       printf("Image Ver:    %x", version);
+       printf("%s\n", get_table_entry_name(imximage_versions, NULL, version));
+       printf("Mode:         %s\n", plugin ? "PLUGIN" : "DCD");
+       if (!plugin) {
+               printf("Data Size:    ");
+               genimg_print_size(hdr_v2->boot_data.size);
+               printf("Load Address: %08x\n", (uint32_t)fhdr_v2->boot_data_ptr);
+               printf("Entry Point:  %08x\n", (uint32_t)fhdr_v2->entry);
+               if (fhdr_v2->csf && (imximage_ivt_offset != UNDEFINED) &&
+                   (imximage_csf_size != UNDEFINED)) {
+                       uint16_t dcdlen;
+                       int offs;
+
+                       dcdlen = hdr_v2->data.dcd_table.header.length;
+                       offs = (char *)&hdr_v2->data.dcd_table
+                               - (char *)hdr_v2;
+
+                       printf("HAB Blocks:   0x%08x 0x%08x 0x%08x\n",
+                              (uint32_t)fhdr_v2->self, 0,
+                              hdr_v2->boot_data.size - imximage_ivt_offset -
+                              imximage_csf_size);
+                       printf("DCD Blocks:   0x00910000 0x%08x 0x%08x\n",
+                              offs, be16_to_cpu(dcdlen));
+               }
+       } else {
+               imx_header_v2_t *next_hdr_v2;
+               flash_header_v2_t *next_fhdr_v2;
+
+               /*First Header*/
+               printf("Plugin Data Size:     ");
+               genimg_print_size(hdr_v2->boot_data.size);
+               printf("Plugin Code Size:     ");
+               genimg_print_size(imximage_plugin_size);
+               printf("Plugin Load Address:  %08x\n", hdr_v2->boot_data.start);
+               printf("Plugin Entry Point:   %08x\n", (uint32_t)fhdr_v2->entry);
+
+               /*Second Header*/
+               next_hdr_v2 = (imx_header_v2_t *)((char *)hdr_v2 +
+                               imximage_plugin_size);
+               next_fhdr_v2 = &next_hdr_v2->fhdr;
+               printf("U-Boot Data Size:     ");
+               genimg_print_size(next_hdr_v2->boot_data.size);
+               printf("U-Boot Load Address:  %08x\n",
+                      next_hdr_v2->boot_data.start);
+               printf("U-Boot Entry Point:   %08x\n",
+                      (uint32_t)next_fhdr_v2->entry);
+       }
+}
+
+static void copy_plugin_code(struct imx_header *imxhdr, char *plugin_file)
+{
+       int ifd;
+       struct stat sbuf;
+       char *plugin_buf = imxhdr->header.hdr_v2.data.plugin_code;
+       char *ptr;
+
+       ifd = open(plugin_file, O_RDONLY|O_BINARY);
+       if (ifd < 0) {
+               fprintf(stderr, "Can't open %s: %s\n",
+                       plugin_file,
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
+       if (fstat(ifd, &sbuf) < 0) {
+               fprintf(stderr, "Can't stat %s: %s\n",
+                       plugin_file,
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
+       ptr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, ifd, 0);
+       if (ptr == MAP_FAILED) {
+               fprintf(stderr, "Can't read %s: %s\n",
+                       plugin_file,
+                       strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
+       if (sbuf.st_size > MAX_PLUGIN_CODE_SIZE) {
+               printf("plugin binary size too large\n");
+               exit(EXIT_FAILURE);
+       }
+
+       memcpy(plugin_buf, ptr, sbuf.st_size);
+       imximage_plugin_size = sbuf.st_size;
+
+       (void) munmap((void *)ptr, sbuf.st_size);
+       (void) close(ifd);
+
+       imxhdr->header.hdr_v2.boot_data.plugin = 1;
+}
+
+static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token,
+                               char *name, int lineno, int fld, int dcd_len)
+{
+       int value;
+       static int cmd_ver_first = ~0;
+
+       switch (cmd) {
+       case CMD_IMAGE_VERSION:
+               imximage_version = get_cfg_value(token, name, lineno);
+               if (cmd_ver_first == 0) {
+                       fprintf(stderr, "Error: %s[%d] - IMAGE_VERSION "
+                               "command need be the first before other "
+                               "valid command in the file\n", name, lineno);
+                       exit(EXIT_FAILURE);
+               }
+               cmd_ver_first = 1;
+               set_hdr_func();
+               break;
+       case CMD_BOOT_FROM:
+               imximage_ivt_offset = get_table_entry_id(imximage_boot_offset,
+                                       "imximage boot option", token);
+               if (imximage_ivt_offset == -1) {
+                       fprintf(stderr, "Error: %s[%d] -Invalid boot device"
+                               "(%s)\n", name, lineno, token);
+                       exit(EXIT_FAILURE);
+               }
+
+               imximage_init_loadsize =
+                       get_table_entry_id(imximage_boot_loadsize,
+                                          "imximage boot option", token);
+
+               if (imximage_init_loadsize == -1) {
+                       fprintf(stderr,
+                               "Error: %s[%d] -Invalid boot device(%s)\n",
+                               name, lineno, token);
+                       exit(EXIT_FAILURE);
+               }
+
+               /*
+                * The SOC loads from the storage starting at address 0
+                * then ensures that the load size contains the offset
+                */
+               if (imximage_init_loadsize < imximage_ivt_offset)
+                       imximage_init_loadsize = imximage_ivt_offset;
+               if (unlikely(cmd_ver_first != 1))
+                       cmd_ver_first = 0;
+               break;
+       case CMD_BOOT_OFFSET:
+               imximage_ivt_offset = get_cfg_value(token, name, lineno);
+               if (unlikely(cmd_ver_first != 1))
+                       cmd_ver_first = 0;
+               break;
+       case CMD_WRITE_DATA:
+       case CMD_WRITE_CLR_BIT:
+       case CMD_WRITE_SET_BIT:
+       case CMD_CHECK_BITS_SET:
+       case CMD_CHECK_BITS_CLR:
+               value = get_cfg_value(token, name, lineno);
+               if (set_dcd_param)
+                       (*set_dcd_param)(imxhdr, dcd_len, cmd);
+               (*set_dcd_val)(imxhdr, name, lineno, fld, value, dcd_len);
+               if (unlikely(cmd_ver_first != 1))
+                       cmd_ver_first = 0;
+               break;
+       case CMD_CSF:
+               if (imximage_version != 2) {
+                       fprintf(stderr,
+                               "Error: %s[%d] - CSF only supported for VERSION 2(%s)\n",
+                               name, lineno, token);
+                       exit(EXIT_FAILURE);
+               }
+               imximage_csf_size = get_cfg_value(token, name, lineno);
+               if (unlikely(cmd_ver_first != 1))
+                       cmd_ver_first = 0;
+               break;
+       case CMD_PLUGIN:
+               plugin_image = 1;
+               copy_plugin_code(imxhdr, token);
+               break;
+       }
 }
 
-static uint32_t imximage_parse_cfg_file(struct imx_header *imxhdr, char *name)
+static void parse_cfg_fld(struct imx_header *imxhdr, int32_t *cmd,
+               char *token, char *name, int lineno, int fld, int *dcd_len)
+{
+       int value;
+
+       switch (fld) {
+       case CFG_COMMAND:
+               *cmd = get_table_entry_id(imximage_cmds,
+                       "imximage commands", token);
+               if (*cmd < 0) {
+                       fprintf(stderr, "Error: %s[%d] - Invalid command"
+                       "(%s)\n", name, lineno, token);
+                       exit(EXIT_FAILURE);
+               }
+               break;
+       case CFG_REG_SIZE:
+               parse_cfg_cmd(imxhdr, *cmd, token, name, lineno, fld, *dcd_len);
+               break;
+       case CFG_REG_ADDRESS:
+       case CFG_REG_VALUE:
+               switch(*cmd) {
+               case CMD_WRITE_DATA:
+               case CMD_WRITE_CLR_BIT:
+               case CMD_WRITE_SET_BIT:
+               case CMD_CHECK_BITS_SET:
+               case CMD_CHECK_BITS_CLR:
+
+                       value = get_cfg_value(token, name, lineno);
+                       if (set_dcd_param)
+                               (*set_dcd_param)(imxhdr, *dcd_len, *cmd);
+                       (*set_dcd_val)(imxhdr, name, lineno, fld, value,
+                                       *dcd_len);
+
+                       if (fld == CFG_REG_VALUE) {
+                               (*dcd_len)++;
+                               if (*dcd_len > max_dcd_entries) {
+                                       fprintf(stderr, "Error: %s[%d] -"
+                                               "DCD table exceeds maximum size(%d)\n",
+                                               name, lineno, max_dcd_entries);
+                                       exit(EXIT_FAILURE);
+                               }
+                       }
+                       break;
+               case CMD_PLUGIN:
+                       value = get_cfg_value(token, name, lineno);
+                       imximage_iram_free_start = value;
+                       break;
+               default:
+                       break;
+               }
+               break;
+       default:
+               break;
+       }
+}
+static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
 {
        FILE *fd = NULL;
        char *line = NULL;
        char *token, *saveptr1, *saveptr2;
        int lineno = 0;
-       int fld, value;
+       int fld;
        size_t len;
        int dcd_len = 0;
-       dcd_t *dcd = &imxhdr->dcd_table;
        int32_t cmd;
 
        fd = fopen(name, "r");
@@ -140,7 +745,8 @@ static uint32_t imximage_parse_cfg_file(struct imx_header *imxhdr, char *name)
                exit(EXIT_FAILURE);
        }
 
-       /* Very simple parsing, line starting with # are comments
+       /*
+        * Very simple parsing, line starting with # are comments
         * and are dropped
         */
        while ((getline(&line, &len, fd)) > 0) {
@@ -161,129 +767,117 @@ static uint32_t imximage_parse_cfg_file(struct imx_header *imxhdr, char *name)
                        if (token[0] == '#')
                                break;
 
-                       /* parse all fields in a single line */
-                       switch (fld) {
-                       case CFG_COMMAND:
-                               cmd = get_table_entry_id(imximage_cmds,
-                                       "imximage commands", token);
-                               if (cmd < 0) {
-                                       fprintf(stderr,
-                                               "Error: %s[%d] - "
-                                               "Invalid command (%s)\n",
-                                               name, lineno, token);
-                                       exit(EXIT_FAILURE);
-                               }
-                               break;
-                       case CFG_REG_SIZE:
-                               switch (cmd) {
-                               case CMD_BOOT_FROM:
-                                       /* Get flash header offset */
-                                       imxhdr->flash_offset =
-                                               get_table_entry_id(
-                                                       imximage_bootops,
-                                                       "imximage boot option",
-                                                       token);
-                                       if (imxhdr->flash_offset == -1) {
-                                               fprintf(stderr,
-                                                       "Error: %s[%d] -"
-                                                       "Invalid boot device"
-                                                       "(%s)\n",
-                                                       name, lineno, token);
-                                               exit(EXIT_FAILURE);
-                                       }
-                                       break;
-                               case CMD_DATA:
-                                       value = get_cfg_value(token,
-                                                       name, lineno);
-
-                                       /* Byte, halfword, word */
-                                       if ((value != 1) &&
-                                               (value != 2) && (value != 4)) {
-                                               fprintf(stderr,
-                                                       "Error: %s[%d] - "
-                                                       "Invalid register size "
-                                                       "(%d)\n",
-                                                       name, lineno, value);
-                                               exit(EXIT_FAILURE);
-                                       }
-                                       dcd->addr_data[dcd_len].type = value;
-                                       break;
-                               }
-
-                       case CFG_REG_ADDRESS:
-                               if (cmd == CMD_DATA)
-                                       dcd->addr_data[dcd_len].addr =
-                                               get_cfg_value(token,
-                                                       name, lineno);
-                               break;
-                       case CFG_REG_VALUE:
-                               if (cmd == CMD_DATA) {
-                                       dcd->addr_data[dcd_len].value =
-                                               get_cfg_value(token,
-                                                       name, lineno);
-                                       dcd_len++;
-                               }
-                               break;
-                       }
+                       parse_cfg_fld(imxhdr, &cmd, token, name,
+                                       lineno, fld, &dcd_len);
                }
 
-               if (dcd_len > MAX_HW_CFG_SIZE) {
-                       fprintf(stderr,
-                               "Error: %s[%d] -"
-                               "DCD table exceeds maximum size(%d)\n",
-                               name, lineno, MAX_HW_CFG_SIZE);
-               }
        }
-       dcd->preamble.barker = DCD_BARKER;
-       dcd->preamble.length = dcd_len * sizeof(dcd_type_addr_data_t);
+
+       (*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
        fclose(fd);
 
+       /* Exit if there is no BOOT_FROM field specifying the flash_offset */
+       if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+               fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+               exit(EXIT_FAILURE);
+       }
        return dcd_len;
 }
 
-static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
-                               struct mkimage_params *params)
+
+static int imximage_check_image_types(uint8_t type)
+{
+       if (type == IH_TYPE_IMXIMAGE)
+               return EXIT_SUCCESS;
+       else
+               return EXIT_FAILURE;
+}
+
+static int imximage_verify_header(unsigned char *ptr, int image_size,
+                       struct image_tool_params *params)
 {
-       struct imx_header *hdr = (struct imx_header *)ptr;
-       flash_header_t *fhdr = &hdr->fhdr;
-       int dcd_len;
-       dcd_t *dcd = &hdr->dcd_table;
-       uint32_t base_offset;
+       struct imx_header *imx_hdr = (struct imx_header *) ptr;
 
-       /* Set default offset */
-       hdr->flash_offset = FLASH_OFFSET_STANDARD;
+       if (detect_imximage_version(imx_hdr) == IMXIMAGE_VER_INVALID)
+               return -FDT_ERR_BADSTRUCTURE;
 
-       /* Set magic number */
-       fhdr->app_code_barker = APP_CODE_BARKER;
+       return 0;
+}
 
-       /* Parse dcd configuration file */
-       dcd_len = imximage_parse_cfg_file(hdr, params->imagename);
+static void imximage_print_header(const void *ptr)
+{
+       struct imx_header *imx_hdr = (struct imx_header *) ptr;
+       uint32_t version = detect_imximage_version(imx_hdr);
+
+       switch (version) {
+       case IMXIMAGE_V1:
+               print_hdr_v1(imx_hdr);
+               break;
+       case IMXIMAGE_V2:
+               print_hdr_v2(imx_hdr);
+               break;
+       default:
+               err_imximage_version(version);
+               break;
+       }
+}
+
+static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
+                               struct image_tool_params *params)
+{
+       struct imx_header *imxhdr = (struct imx_header *)ptr;
+       uint32_t dcd_len;
+       uint32_t header_size;
 
-       fhdr->app_dest_ptr = params->addr;
-       fhdr->app_dest_ptr = params->ep - hdr->flash_offset -
-               sizeof(struct imx_header);
-       fhdr->app_code_jump_vector = params->ep;
+       /*
+        * In order to not change the old imx cfg file
+        * by adding VERSION command into it, here need
+        * set up function ptr group to V1 by default.
+        */
+       imximage_version = IMXIMAGE_V1;
+       /* Be able to detect if the cfg file has no BOOT_FROM tag */
+       imximage_ivt_offset = FLASH_OFFSET_UNDEFINED;
+       imximage_csf_size = 0;
+       set_hdr_func();
 
-       base_offset = fhdr->app_dest_ptr + hdr->flash_offset ;
-       fhdr->dcd_ptr_ptr = (uint32_t) (offsetof(flash_header_t, dcd_ptr) -
-               offsetof(flash_header_t, app_code_jump_vector) +
-               base_offset);
+       /* Parse dcd configuration file */
+       dcd_len = parse_cfg_file(imxhdr, params->imagename);
+
+       if (imximage_version == IMXIMAGE_V1)
+               header_size = sizeof(flash_header_v1_t);
+       else {
+               header_size = sizeof(flash_header_v2_t) + sizeof(boot_data_t);
+               if (!plugin_image)
+                       header_size += sizeof(dcd_v2_t);
+               else
+                       header_size += MAX_PLUGIN_CODE_SIZE;
+       }
 
-       fhdr->dcd_ptr = base_offset +
-                       offsetof(struct imx_header, dcd_table);
+       if (imximage_init_loadsize < imximage_ivt_offset + header_size)
+                       imximage_init_loadsize = imximage_ivt_offset + header_size;
 
-       /* The external flash header must be at the end of the DCD table */
-       dcd->addr_data[dcd_len].type = sbuf->st_size +
-                               hdr->flash_offset +
-                               sizeof(struct imx_header);
+       /* Set the imx header */
+       (*set_imx_hdr)(imxhdr, dcd_len, params->ep, imximage_ivt_offset);
 
-       /* Security feature are not supported */
-       fhdr->app_code_csf = 0;
-       fhdr->super_root_key = 0;
+       /*
+        * ROM bug alert
+        *
+        * MX53 only loads 512 byte multiples in case of SD boot.
+        * MX53 only loads NAND page multiples in case of NAND boot and
+        * supports up to 4096 byte large pages, thus align to 4096.
+        *
+        * The remaining fraction of a block bytes would not be loaded!
+        */
+       *header_size_ptr = ROUND((sbuf->st_size + imximage_ivt_offset), 4096);
 
+       if (csf_ptr && imximage_csf_size) {
+               *csf_ptr = params->ep - imximage_init_loadsize +
+                       *header_size_ptr;
+               *header_size_ptr += imximage_csf_size;
+       }
 }
 
-int imximage_check_params(struct mkimage_params *params)
+int imximage_check_params(struct image_tool_params *params)
 {
        if (!params)
                return CFG_INVALID;
@@ -305,21 +899,93 @@ int imximage_check_params(struct mkimage_params *params)
                (params->xflag) || !(strlen(params->imagename));
 }
 
+static int imximage_generate(struct image_tool_params *params,
+       struct image_type_params *tparams)
+{
+       struct imx_header *imxhdr;
+       size_t alloc_len;
+       struct stat sbuf;
+       char *datafile = params->datafile;
+       uint32_t pad_len, header_size;
+
+       memset(&imximage_header, 0, sizeof(imximage_header));
+
+       /*
+        * In order to not change the old imx cfg file
+        * by adding VERSION command into it, here need
+        * set up function ptr group to V1 by default.
+        */
+       imximage_version = IMXIMAGE_V1;
+       /* Be able to detect if the cfg file has no BOOT_FROM tag */
+       imximage_ivt_offset = FLASH_OFFSET_UNDEFINED;
+       imximage_csf_size = 0;
+       set_hdr_func();
+
+       /* Parse dcd configuration file */
+       parse_cfg_file(&imximage_header, params->imagename);
+
+       if (imximage_version == IMXIMAGE_V1)
+               header_size = sizeof(imx_header_v1_t);
+       else {
+               header_size = sizeof(flash_header_v2_t) + sizeof(boot_data_t);
+               if (!plugin_image)
+                       header_size += sizeof(dcd_v2_t);
+               else
+                       header_size += MAX_PLUGIN_CODE_SIZE;
+       }
+
+       if (imximage_init_loadsize < imximage_ivt_offset + header_size)
+                       imximage_init_loadsize = imximage_ivt_offset + header_size;
+
+       alloc_len = imximage_init_loadsize - imximage_ivt_offset;
+
+       if (alloc_len < header_size) {
+               fprintf(stderr, "%s: header error\n",
+                       params->cmdname);
+               exit(EXIT_FAILURE);
+       }
+
+       imxhdr = malloc(alloc_len);
+
+       if (!imxhdr) {
+               fprintf(stderr, "%s: malloc return failure: %s\n",
+                       params->cmdname, strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
+       memset(imxhdr, 0, alloc_len);
+
+       tparams->header_size = alloc_len;
+       tparams->hdr         = imxhdr;
+
+       /* determine data image file length */
+
+       if (stat(datafile, &sbuf) < 0) {
+               fprintf(stderr, "%s: Can't stat %s: %s\n",
+                       params->cmdname, datafile, strerror(errno));
+               exit(EXIT_FAILURE);
+       }
+
+       pad_len = ROUND(sbuf.st_size, 4096) - sbuf.st_size;
+
+       return pad_len;
+}
+
+
 /*
  * imximage parameters
  */
-static struct image_type_params imximage_params = {
-       .name           = "Freescale i.MX 51 Boot Image support",
-       .header_size    = sizeof(struct imx_header),
-       .hdr            = (void *)&imximage_header,
-       .check_image_type = imximage_check_image_types,
-       .verify_header  = imximage_verify_header,
-       .print_header   = imximage_print_header,
-       .set_header     = imximage_set_header,
-       .check_params   = imximage_check_params,
-};
-
-void init_imx_image_type(void)
-{
-       mkimage_register(&imximage_params);
-}
+U_BOOT_IMAGE_TYPE(
+       imximage,
+       "Freescale i.MX Boot Image support",
+       0,
+       NULL,
+       imximage_check_params,
+       imximage_verify_header,
+       imximage_print_header,
+       imximage_set_header,
+       NULL,
+       imximage_check_image_types,
+       NULL,
+       imximage_generate
+);