* [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning
@ 2013-09-20 19:24 York Sun
2013-09-26 15:24 ` Stefano Babic
2013-09-27 12:03 ` Stefano Babic
0 siblings, 2 replies; 3+ messages in thread
From: York Sun @ 2013-09-20 19:24 UTC (permalink / raw)
To: u-boot
Convert set_hdr_func(struct imx_header *imxhdr) to set_hdr_func(void)
to get rid of the warning
warning: ?imxhdr? is used uninitialized in this function
Signed-off-by: York Sun <yorksun@freescale.com>
---
tools/imximage.c | 8 ++++----
1 file 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning
2013-09-20 19:24 [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning York Sun
@ 2013-09-26 15:24 ` Stefano Babic
2013-09-27 12:03 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2013-09-26 15:24 UTC (permalink / raw)
To: u-boot
Hi York,
On 20/09/2013 21:24, York Sun wrote:
> Convert set_hdr_func(struct imx_header *imxhdr) to set_hdr_func(void)
> to get rid of the warning
>
> warning: ?imxhdr? is used uninitialized in this function
>
> Signed-off-by: York Sun <yorksun@freescale.com>
> ---
> tools/imximage.c | 8 ++++----
> 1 file 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);
>
Thanks for fixing this !
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning
2013-09-20 19:24 [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning York Sun
2013-09-26 15:24 ` Stefano Babic
@ 2013-09-27 12:03 ` Stefano Babic
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2013-09-27 12:03 UTC (permalink / raw)
To: u-boot
On 20/09/2013 21:24, York Sun wrote:
> Convert set_hdr_func(struct imx_header *imxhdr) to set_hdr_func(void)
> to get rid of the warning
>
> warning: ?imxhdr? is used uninitialized in this function
>
> Signed-off-by: York Sun <yorksun@freescale.com>
> ---
Applied to u-boot-imx (fix), thanks!
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-27 12:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 19:24 [U-Boot] [PATCH] tools/imximage.c: Fix compiling warning York Sun
2013-09-26 15:24 ` Stefano Babic
2013-09-27 12:03 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox