Dear Stefano Babic, > Change to dynamically allocate the imx_header to correctly > allocate the IVT, Boot Data and DCD at correct locations > depending on the boot media. > > Also check that the Image Vector Table Offset + IVT + > Boot Data + DCD <= Initial Load Region Size. > > Previously struct imx_header was always 4096 bytes and was > not dealing correctly with the Image Vector Table Offset. > > Now, the memory allocation looks for e.g. SD boot like this > > Storage u-boot.imx RAM > Device > > 00000000 177ff000 <-------------- > > 00000400 00000000 d1 00 20 40 IVT.header 177ff400 <------- | > 00000404 00000004 00 00 80 17 IVT.entry 177ff404 ----------- | > 00000408 00000008 00 00 00 00 IVT.reserved1 177ff408 | | | > 0000040C 0000000C 2c f4 7f 17 IVT.dcd 177ff40C ------ | | | > 00000410 00000010 20 f4 7f 17 IVT.boot 177ff410 ---- | | | | > 00000414 00000014 00 f4 7f 17 IVT.self 177ff414 -------- | | > 00000418 00000018 00 00 00 00 IVT.csf 177ff418 | | | | > 0000041C 0000001C 00 00 00 00 IVT.reserved2 177ff41C | | | | > 00000420 00000020 00 f0 7f 17 BootData.start 177ff420 <--- | | --- > 00000424 00000024 00 60 03 00 BootData.length 177ff424 | | > 00000428 00000028 00 00 00 00 BootData.plugin 177ff428 | | > 0000042C 0000002C d2 03 30 40 DCD.header 177ff42C <----- | > ... | > 00001000 00000c00 13 00 00 ea U-Boot Start 17800000 <---------- > > While at it also remove the unused #define HEADER_OFFSET. > > Signed-off-by: Stefano Babic <sba...@denx.de> > --- > tools/imximage.c | 44 +++++++++++++++++++++++++++++++++++++------- > tools/imximage.h | 16 +++++++++++++--- > 2 files changed, 50 insertions(+), 10 deletions(-) > > diff --git a/tools/imximage.c b/tools/imximage.c > index d87e94d..984cb9b 100644 > --- a/tools/imximage.c > +++ b/tools/imximage.c > @@ -47,7 +47,7 @@ static table_entry_t imximage_cmds[] = { > * Supported Boot options for configuration file > * this is needed to set the correct flash offset > */ > -static table_entry_t imximage_bootops[] = { > +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", }, > @@ -58,6 +58,20 @@ static table_entry_t imximage_bootops[] = { > }; > > /* > + * 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", }, > + {-1, "", "Invalid", }, > +}; > + > +/* > * IMXIMAGE version definition for i.MX chips > */ > static table_entry_t imximage_versions[] = { > @@ -70,6 +84,8 @@ static struct imx_header imximage_header; > static uint32_t imximage_version; > /* Image Vector Table Offset */ > static uint32_t imximage_ivt_offset; > +/* Initial Load Region Size */ > +static uint32_t imximage_init_loadsize; > > static set_dcd_val_t set_dcd_val; > static set_dcd_rst_t set_dcd_rst; > @@ -211,7 +227,9 @@ static void set_imx_hdr_v1(struct imx_header *imxhdr, > uint32_t dcd_len, /* Set magic number */ > fhdr_v1->app_code_barker = APP_CODE_BARKER; > > - hdr_base = entry_point - sizeof(struct imx_header); > + /* TODO: check i.MX image V1 handling, for now use 'old' style */ > + /* hdr_base = entry_point - imximage_init_loadsize + flash_offset; */
The above line should probably be removed. [...] > @@ -163,7 +173,7 @@ struct imx_header { > imx_header_v1_t hdr_v1; > imx_header_v2_t hdr_v2; > } header; > -} __attribute__((aligned(4096))); > +}; What about the alignment, is it preserved? Best regards, Marek Vasut _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot