diff options
| author | Simon Glass <sjg@chromium.org> | 2013-08-30 11:00:09 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2013-09-03 13:29:24 -0600 |
| commit | 628af1790ac3231455c1ae4a4e43b67136799fa2 (patch) | |
| tree | a26f846a88ca4702e867428a40fed7c6b8562420 /common/cmd_ximg.c | |
| parent | fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c (diff) | |
| download | u-boot-628af1790ac3231455c1ae4a4e43b67136799fa2.tar.gz u-boot-628af1790ac3231455c1ae4a4e43b67136799fa2.tar.bz2 u-boot-628af1790ac3231455c1ae4a4e43b67136799fa2.zip | |
sandbox: Correct compiler warnings in cmd_bootm/cmd_ximg
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>
Diffstat (limited to 'common/cmd_ximg.c')
| -rw-r--r-- | common/cmd_ximg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c index b439be3d08..65a8319662 100644 --- a/common/cmd_ximg.c +++ b/common/cmd_ximg.c @@ -20,6 +20,7 @@ #include <bzlib.h> #endif #include <asm/byteorder.h> +#include <asm/io.h> #ifndef CONFIG_SYS_XIMG_LEN /* 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; int verify; int part = 0; - image_header_t *hdr; + image_header_t *hdr = NULL; #if defined(CONFIG_FIT) const char *uname = NULL; 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. */ i = BZ2_bzBuffToBuffDecompress( - (char *)ntohl(hdr->ih_load), + map_sysmem(ntohl(hdr->ih_load), 0), &unc_len, (char *)data, len, CONFIG_SYS_MALLOC_LEN < (4096 * 1024), 0); |