aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commitf0776fe06ad1c9a787daecb89ccd97479a0a1235 (patch)
treef409643702fcbe509bbe2c1036e5516eb225061f /target/linux
parentec7df316638a6deeed9e4939ece9a63484b8ff18 (diff)
downloadmaster-187ad058-f0776fe06ad1c9a787daecb89ccd97479a0a1235.tar.gz
master-187ad058-f0776fe06ad1c9a787daecb89ccd97479a0a1235.tar.bz2
master-187ad058-f0776fe06ad1c9a787daecb89ccd97479a0a1235.zip
Resync adm5120 kernel config, lzma-loader fixes from Gabor
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7536 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/adm5120-2.6/config/default6
-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
4 files changed, 19 insertions, 9 deletions
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index f4361a9c8c..d83efc2baf 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -15,7 +15,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
CONFIG_CIFS_STATS2=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs,yaffs2 init=/etc/preinit"
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y
@@ -63,8 +63,6 @@ CONFIG_GENERIC_GPIO=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_FF is not set
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HW_HAS_PCI=y
@@ -88,6 +86,7 @@ CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IRQ_CPU=y
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_POSIX_ACL=y
@@ -268,7 +267,6 @@ CONFIG_USB_ADM5120_HCD=y
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_USBNET_MII is not set
-CONFIG_USB_YEALINK=m
# CONFIG_USB_ZD1201 is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_YAFFS_9BYTE_TAGS=y
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 f867e20dc5..ffc87ee0db 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 f9358257c9..bae70fb6ea 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 b6984d742a..abf756ba13 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 = .;