Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sandbox: Correct compiler warnings in cmd_bootm/cmd_ximg

Browse source 
Correct the following warnings found with sandbox when compression
is enabled.

cmd_bootm.c: In function 'bootm_load_os':
cmd_bootm.c:443:11: warning: passing argument 4 of 'lzop_decompress' from incompatible pointer type [enabled by default]
/usr/local/google/c/cosarm/src/third_party/u-boot/files/include/linux/lzo.h:31:5: note: expected 'size_t *' but argument is of type 'uint *'
cmd_ximg.c: In function 'do_imgextract':
cmd_ximg.c:225:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
cmd_ximg.c:225:14: warning: 'hdr' may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Simon Glass 2013-08-30 11:00:09 -06:00
parent fb18fa95a1
commit 628af1790a
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/cmd_bootm.c
View file

@ -436,11 +436,12 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
} }
#endif /* CONFIG_LZMA */ #endif /* CONFIG_LZMA */
#ifdef CONFIG_LZO #ifdef CONFIG_LZO
case IH_COMP_LZO: case IH_COMP_LZO: {
size_t size;
printf(" Uncompressing %s ... ", type_name); printf(" Uncompressing %s ... ", type_name);
ret = lzop_decompress(image_buf, image_len, load_buf, ret = lzop_decompress(image_buf, image_len, load_buf, &size);
&unc_len);
if (ret != LZO_E_OK) { if (ret != LZO_E_OK) {
printf("LZO: uncompress or overwrite error %d " printf("LZO: uncompress or overwrite error %d "
"- must RESET board to recover\n", ret); "- must RESET board to recover\n", ret);
@ -449,8 +450,9 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
return BOOTM_ERR_RESET; return BOOTM_ERR_RESET;
} }
*load_end = load + unc_len; *load_end = load + size;
break; break;
}
#endif /* CONFIG_LZO */ #endif /* CONFIG_LZO */
default: default:
printf("Unimplemented compression type %d\n", comp); printf("Unimplemented compression type %d\n", comp);

5
common/cmd_ximg.c
View file

@ -20,6 +20,7 @@
#include <bzlib.h> #include <bzlib.h>
#endif #endif
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/io.h>
#ifndef CONFIG_SYS_XIMG_LEN #ifndef CONFIG_SYS_XIMG_LEN
/* use 8MByte as default max gunzip size */ /* use 8MByte as default max gunzip size */
@ -34,7 +35,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
ulong data, len, count; ulong data, len, count;
int verify; int verify;
int part = 0; int part = 0;
image_header_t *hdr; image_header_t *hdr = NULL;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const char *uname = NULL; const char *uname = NULL;
const void* fit_hdr; const void* fit_hdr;
@ -222,7 +223,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
* which requires at most 2300 KB of memory. * which requires at most 2300 KB of memory.
*/ */
i = BZ2_bzBuffToBuffDecompress( i = BZ2_bzBuffToBuffDecompress(
(char *)ntohl(hdr->ih_load), map_sysmem(ntohl(hdr->ih_load), 0),
&unc_len, (char *)data, len, &unc_len, (char *)data, len,
CONFIG_SYS_MALLOC_LEN < (4096 * 1024), CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
0); 0);