summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-09-08 22:03:11 +0000
committerwdenk <wdenk>2004-09-08 22:03:11 +0000
commiteedcd078fe1434d93b84322c4e14c52f80282a41 (patch)
tree0dd7b16045dd41fbda926f929f1d7cf8edbd2ae0 /common/cmd_bootm.c
parent7ca202f566a6e9dc3d0dd0216e82ad1a48f50f19 (diff)
downloadu-boot-imx-eedcd078fe1434d93b84322c4e14c52f80282a41.zip
u-boot-imx-eedcd078fe1434d93b84322c4e14c52f80282a41.tar.gz
u-boot-imx-eedcd078fe1434d93b84322c4e14c52f80282a41.tar.bz2
* Patch by Detlev Zundel, 08 Sep 2004:
Update etags build target * Improve NetConsole support: add support for broadcast destination address and buffered input. * Cleanup compiler warnings for GCC 3.3.x and later * Fix problem in cmd_jffs2.c introduced by CFG_JFFS_SINGLE_PART patch
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 421269e..5aa072f 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -73,7 +73,7 @@
# define CHUNKSZ (64 * 1024)
#endif
-int gunzip (void *, int, unsigned char *, int *);
+int gunzip (void *, int, unsigned char *, unsigned long *);
static void *zalloc(void *, unsigned, unsigned);
static void zfree(void *, void *, unsigned);
@@ -326,7 +326,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
case IH_COMP_GZIP:
printf (" Uncompressing %s ... ", name);
if (gunzip ((void *)ntohl(hdr->ih_load), unc_len,
- (uchar *)data, (int *)&len) != 0) {
+ (uchar *)data, &len) != 0) {
puts ("GUNZIP ERROR - must RESET board to recover\n");
SHOW_BOOT_PROGRESS (-6);
do_reset (cmdtp, flag, argc, argv);
@@ -1239,7 +1239,7 @@ static void zfree(void *x, void *addr, unsigned nb)
#define DEFLATED 8
-int gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
+int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
{
z_stream s;
int r, i, flags;