Resync adm5120 kernel config, lzma-loader fixes from Gabor

[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / image / lzma-loader / src / decompress.c

diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c b/target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c
index f867e20dc5110f51d088e62a4f7e98ebd4fbeb2c..ffc87ee0db56a3bd4e03a4757e97cdb014ef9314 100644 (file)
--- a/target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c
+++ b/target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c
@@ -277,9 +277,20 @@ void decompress_entry(unsigned long reg_a0, unsigned long reg_a1,
                (unsigned char*)LOADADDR, osize, &i);
 #endif
        if (res != LZMA_RESULT_OK) {
                (unsigned char*)LOADADDR, osize, &i);
 #endif
        if (res != LZMA_RESULT_OK) {

-               print_str("failed, LzmaDecode error: ");
-               print_hex(res);
-               print_str("\n");
+               print_str("failed!\n");
+               print_str("LzmaDecode: ");
+               switch (res) {
+               case LZMA_RESULT_DATA_ERROR:
+                       print_str("data error\n");
+                       break;
+               case LZMA_RESULT_NOT_ENOUGH_MEM:
+                       print_str("not enough memory\n");
+                       break;
+               default:
+                       print_str("unknown error, err=0x");
+                       print_hex(res);
+                       print_str("\n");
+               }

                halt();
        }
 
                halt();
        }