diff options
| author | wdenk <wdenk> | 2004-09-08 22:03:11 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-09-08 22:03:11 +0000 |
| commit | eedcd078fe1434d93b84322c4e14c52f80282a41 (patch) | |
| tree | 0dd7b16045dd41fbda926f929f1d7cf8edbd2ae0 /common | |
| parent | 7ca202f566a6e9dc3d0dd0216e82ad1a48f50f19 (diff) | |
* Patch by Detlev Zundel, 08 Sep 2004:LABEL_2004_09_09_0000
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')
| -rw-r--r-- | common/cmd_bootm.c | 6 | ||||
| -rw-r--r-- | common/cmd_jffs2.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 421269ef2cb..5aa072fbd11 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; diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index f7a5f9ebfd4..63fddf657a3 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -257,6 +257,12 @@ do_jffs2_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } + +U_BOOT_CMD( + chpart, 2, 0, do_jffs2_chpart, + "chpart\t- change active partition\n", + " - change active partition\n" +); #endif /* CFG_JFFS_SINGLE_PART */ /***************************************************/ @@ -282,10 +288,4 @@ U_BOOT_CMD( " - list files in a directory.\n" ); -U_BOOT_CMD( - chpart, 2, 0, do_jffs2_chpart, - "chpart\t- change active partition\n", - " - change active partition\n" -); - #endif /* CFG_CMD_JFFS2 */ |