Patch from Robert Schwebel: more verbose messages if decompression fails

diff --git a/MAKEALL b/MAKEALL
index 1db2bd463f94fec3a91a00edb79ac340dfd730b0..70cea5552269177beaac85013f25567f99d9afe3 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -46,7 +46,7 @@ build_target() {
        ${MAKE} clean >/dev/null
        ${MAKE} ${target}_config
        ${MAKE} all 2>&1 >LOG/$target.MAKELOG | tee LOG/$target.ERR
-       ${CROSS_COMPILE:-arm_armv4-}size armboot | tee -a LOG/$target.MAKELOG
+       ${CROSS_COMPILE}size armboot | tee -a LOG/$target.MAKELOG
        test -n "$KEEP_BINARY" && cp armboot.bin LOG/$target.bin
        test -n "$KEEP_ELF" && cp armboot LOG/$target.elf
 }

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 4405442e203f434bf57b58b45eacfeebabef6a25..522ce9a7ccf651d9a15214d41026bc0f49c5a838 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -430,7 +430,15 @@ int gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
 
        r = inflateInit2(&s, -MAX_WBITS);
        if (r != Z_OK) {
-               printf ("Error: inflateInit2() returned %d\n", r);
+               printf ("Error: inflateInit2() returned %d (", r);
+               switch (r) {
+                       case Z_ERRNO:           printf("ERRNO");        break;
+                       case Z_STREAM_ERROR:    printf("STREAM_ERROR"); break;
+                       case Z_DATA_ERROR:      printf("DATA_ERROR");   break;
+                       case Z_MEM_ERROR:       printf("MEM_ERROR");    break;
+                       case Z_BUF_ERROR:       printf("BUF_ERROR");    break; 
+               }
+               printf(")\n");
                return (-1);
        }
        s.next_in = src + i;