V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tools: rename mximage_flash_offset to imximage_ivt_offset 

This better reflects the naming from the Reference Manual
as well as fits better since "flash" is not really applicabe
for SATA.

Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Stefano Babic 2013-06-26 18:08:37 +02:00
parent 4655d40f34
commit 3150f92c29
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/imximage.c
View File

@ -52,7 +52,8 @@ static table_entry_t imximage_versions[] = {
static struct imx_header imximage_header; static struct imx_header imximage_header;
static uint32_t imximage_version; static uint32_t imximage_version;
static uint32_t imximage_flash_offset; /* Image Vector Table Offset */
static uint32_t imximage_ivt_offset;
static set_dcd_val_t set_dcd_val; static set_dcd_val_t set_dcd_val;
static set_dcd_rst_t set_dcd_rst; static set_dcd_rst_t set_dcd_rst;
@ -328,9 +329,9 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token,
set_hdr_func(imxhdr); set_hdr_func(imxhdr);
break; break;
case CMD_BOOT_FROM: case CMD_BOOT_FROM:
imximage_flash_offset = get_table_entry_id(imximage_bootops, imximage_ivt_offset = get_table_entry_id(imximage_bootops,
"imximage boot option", token); "imximage boot option", token);
if (imximage_flash_offset == -1) { if (imximage_ivt_offset == -1) {
fprintf(stderr, "Error: %s[%d] -Invalid boot device" fprintf(stderr, "Error: %s[%d] -Invalid boot device"
"(%s)\n", name, lineno, token); "(%s)\n", name, lineno, token);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -339,7 +340,7 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token,
cmd_ver_first = 0; cmd_ver_first = 0;
break; break;
case CMD_BOOT_OFFSET: case CMD_BOOT_OFFSET:
imximage_flash_offset = get_cfg_value(token, name, lineno); imximage_ivt_offset = get_cfg_value(token, name, lineno);
if (unlikely(cmd_ver_first != 1)) if (unlikely(cmd_ver_first != 1))
cmd_ver_first = 0; cmd_ver_first = 0;
break; break;
@ -440,7 +441,7 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
fclose(fd); fclose(fd);
/* Exit if there is no BOOT_FROM field specifying the flash_offset */ /* Exit if there is no BOOT_FROM field specifying the flash_offset */
if (imximage_flash_offset == FLASH_OFFSET_UNDEFINED) { if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name); fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -498,14 +499,14 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
*/ */
imximage_version = IMXIMAGE_V1; imximage_version = IMXIMAGE_V1;
/* Be able to detect if the cfg file has no BOOT_FROM tag */ /* Be able to detect if the cfg file has no BOOT_FROM tag */
imximage_flash_offset = FLASH_OFFSET_UNDEFINED; imximage_ivt_offset = FLASH_OFFSET_UNDEFINED;
set_hdr_func(imxhdr); set_hdr_func(imxhdr);
/* Parse dcd configuration file */ /* Parse dcd configuration file */
dcd_len = parse_cfg_file(imxhdr, params->imagename); dcd_len = parse_cfg_file(imxhdr, params->imagename);
/* Set the imx header */ /* Set the imx header */
(*set_imx_hdr)(imxhdr, dcd_len, params->ep, imximage_flash_offset); (*set_imx_hdr)(imxhdr, dcd_len, params->ep, imximage_ivt_offset);
/* /*
* ROM bug alert * ROM bug alert
@ -516,7 +517,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
* *
* The remaining fraction of a block bytes would not be loaded! * The remaining fraction of a block bytes would not be loaded!
*/ */
*header_size_ptr = ROUND(sbuf->st_size + imximage_flash_offset, 4096); *header_size_ptr = ROUND(sbuf->st_size + imximage_ivt_offset, 4096);
} }
int imximage_check_params(struct mkimage_params *params) int imximage_check_params(struct mkimage_params *params)