summaryrefslogtreecommitdiff
path: root/target/linux/adm5120-2.6/image
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-08 12:58:55 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-08 12:58:55 +0000
commitd28ca51872a803f9073dd72bce7208f5e05c62c6 (patch)
tree9d7448ad0a3a5eb2e43c41159e2ade4d40a464fe /target/linux/adm5120-2.6/image
parenta014690ed69fe7d48d8483393d8dd8a5177698b0 (diff)
downloadmtk-20170518-d28ca51872a803f9073dd72bce7208f5e05c62c6.zip
mtk-20170518-d28ca51872a803f9073dd72bce7208f5e05c62c6.tar.gz
mtk-20170518-d28ca51872a803f9073dd72bce7208f5e05c62c6.tar.bz2
Resync adm5120 kernel config, lzma-loader fixes from Gabor
SVN-Revision: 7536
Diffstat (limited to 'target/linux/adm5120-2.6/image')
-rw-r--r--target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c17
-rw-r--r--target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds2
-rw-r--r--target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds3
3 files changed, 17 insertions, 5 deletions
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 f867e20..ffc87ee 100644
--- 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) {
- 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();
}
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds b/target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds
index f935825..bae70fb 100644
--- a/target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds
+++ b/target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds
@@ -6,6 +6,8 @@ SECTIONS {
*(.text.*)
*(.rodata)
*(.rodata.*)
+ . = ALIGN(16);
+ *(.data.lzma)
}
.data : {
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds b/target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds
index b6984d7..abf756b 100644
--- a/target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds
+++ b/target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds
@@ -1,7 +1,6 @@
OUTPUT_ARCH(mips)
SECTIONS {
- .rodata : {
- . = ALIGN(16);
+ .data.lzma : {
_lzma_data_start = .;
*(.data)
_lzma_data_end = .;