tools: dynamically allocate imx_header in imximage
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 <sbabic@denx.de>
This commit is contained in:
Stefano Babic
parent
3150f92c29
commit
377e367a85
|
|
@ -31,7 +31,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", },
|
||||
|
|
@ -41,6 +41,20 @@ static table_entry_t imximage_bootops[] = {
|
|||
{-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", },
|
||||
{-1, "", "Invalid", },
|
||||
};
|
||||
|
||||
/*
|
||||
* IMXIMAGE version definition for i.MX chips
|
||||
*/
|
||||
|
|
@ -54,6 +68,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;
|
||||
|
|
@ -195,7 +211,8 @@ 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 - 4096;
|
||||
fhdr_v1->app_dest_ptr = hdr_base - flash_offset;
|
||||
fhdr_v1->app_code_jump_vector = entry_point;
|
||||
|
||||
|
|
@ -222,12 +239,13 @@ static void set_imx_hdr_v2(struct imx_header *imxhdr, uint32_t dcd_len,
|
|||
|
||||
fhdr_v2->entry = entry_point;
|
||||
fhdr_v2->reserved1 = fhdr_v2->reserved2 = 0;
|
||||
fhdr_v2->self = hdr_base = entry_point - sizeof(struct imx_header);
|
||||
|
||||
hdr_base = entry_point - imximage_init_loadsize +
|
||||
flash_offset;
|
||||
fhdr_v2->self = hdr_base;
|
||||
fhdr_v2->dcd_ptr = hdr_base + offsetof(imx_header_v2_t, dcd_table);
|
||||
fhdr_v2->boot_data_ptr = hdr_base
|
||||
+ offsetof(imx_header_v2_t, boot_data);
|
||||
hdr_v2->boot_data.start = hdr_base - flash_offset;
|
||||
hdr_v2->boot_data.start = entry_point - imximage_init_loadsize;
|
||||
|
||||
/* Security feature are not supported */
|
||||
fhdr_v2->csf = 0;
|
||||
|
|
@ -329,13 +347,24 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token,
|
|||
set_hdr_func(imxhdr);
|
||||
break;
|
||||
case CMD_BOOT_FROM:
|
||||
imximage_ivt_offset = get_table_entry_id(imximage_bootops,
|
||||
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);
|
||||
}
|
||||
if (unlikely(cmd_ver_first != 1))
|
||||
cmd_ver_first = 0;
|
||||
break;
|
||||
|
|
@ -517,7 +546,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
|
|||
*
|
||||
* The remaining fraction of a block bytes would not be loaded!
|
||||
*/
|
||||
*header_size_ptr = ROUND(sbuf->st_size + imximage_ivt_offset, 4096);
|
||||
*header_size_ptr = ROUND(sbuf->st_size, 4096);
|
||||
}
|
||||
|
||||
int imximage_check_params(struct mkimage_params *params)
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
#define APP_CODE_BARKER 0xB1
|
||||
#define DCD_BARKER 0xB17219E9
|
||||
|
||||
#define HEADER_OFFSET 0x400
|
||||
|
||||
/*
|
||||
* NOTE: This file must be kept in sync with arch/arm/include/asm/\
|
||||
* imx-common/imximage.cfg because tools/imximage.c can not
|
||||
* cross-include headers from arch/arm/ and vice-versa.
|
||||
*/
|
||||
#define CMD_DATA_STR "DATA"
|
||||
|
||||
/* Initial Vector Table Offset */
|
||||
#define FLASH_OFFSET_UNDEFINED 0xFFFFFFFF
|
||||
#define FLASH_OFFSET_STANDARD 0x400
|
||||
#define FLASH_OFFSET_NAND FLASH_OFFSET_STANDARD
|
||||
|
|
@ -30,6 +30,16 @@
|
|||
#define FLASH_OFFSET_NOR 0x1000
|
||||
#define FLASH_OFFSET_SATA FLASH_OFFSET_STANDARD
|
||||
|
||||
/* Initial Load Region Size */
|
||||
#define FLASH_LOADSIZE_UNDEFINED 0xFFFFFFFF
|
||||
#define FLASH_LOADSIZE_STANDARD 0x1000
|
||||
#define FLASH_LOADSIZE_NAND FLASH_LOADSIZE_STANDARD
|
||||
#define FLASH_LOADSIZE_SD FLASH_LOADSIZE_STANDARD
|
||||
#define FLASH_LOADSIZE_SPI FLASH_LOADSIZE_STANDARD
|
||||
#define FLASH_LOADSIZE_ONENAND 0x400
|
||||
#define FLASH_LOADSIZE_NOR 0x0 /* entire image */
|
||||
#define FLASH_LOADSIZE_SATA FLASH_LOADSIZE_STANDARD
|
||||
|
||||
#define IVT_HEADER_TAG 0xD1
|
||||
#define IVT_VERSION 0x40
|
||||
#define DCD_HEADER_TAG 0xD2
|
||||
|
|
@ -147,7 +157,7 @@ struct imx_header {
|
|||
imx_header_v1_t hdr_v1;
|
||||
imx_header_v2_t hdr_v2;
|
||||
} header;
|
||||
} __attribute__((aligned(4096)));
|
||||
};
|
||||
|
||||
typedef void (*set_dcd_val_t)(struct imx_header *imxhdr,
|
||||
char *name, int lineno,
|
||||
|
|
|
|||
Loading…
Reference in New Issue