diff options
author | Tom Rini <trini@ti.com> | 2013-10-02 11:45:22 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-10-02 11:45:22 -0400 |
commit | 6297872cd5de4705b6318778261b1f3f64a34c11 (patch) | |
tree | 7159ac1b03daa6906c8609b2515e42214f3bc422 /tools/imximage.c | |
parent | 0ae39166b1babbc86da4269458da9bce198bce55 (diff) | |
parent | f04c53762962280365005c9db12ab561a18f2692 (diff) | |
download | u-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.zip u-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.tar.gz u-boot-imx-6297872cd5de4705b6318778261b1f3f64a34c11.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'tools/imximage.c')
-rw-r--r-- | tools/imximage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index c87669b..32e4efe 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -259,7 +259,7 @@ static void set_imx_hdr_v2(struct imx_header *imxhdr, uint32_t dcd_len, csf_ptr = &fhdr_v2->csf; } -static void set_hdr_func(struct imx_header *imxhdr) +static void set_hdr_func(void) { switch (imximage_version) { case IMXIMAGE_V1: @@ -358,7 +358,7 @@ static void parse_cfg_cmd(struct imx_header *imxhdr, int32_t cmd, char *token, exit(EXIT_FAILURE); } cmd_ver_first = 1; - set_hdr_func(imxhdr); + set_hdr_func(); break; case CMD_BOOT_FROM: imximage_ivt_offset = get_table_entry_id(imximage_boot_offset, @@ -563,7 +563,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, /* 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(imxhdr); + set_hdr_func(); /* Parse dcd configuration file */ dcd_len = parse_cfg_file(imxhdr, params->imagename); @@ -631,7 +631,7 @@ static int imximage_generate(struct mkimage_params *params, /* 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(imxhdr); + set_hdr_func(); /* Parse dcd configuration file */ parse_cfg_file(&imximage_header, params->imagename); |