qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 12:32:48 +02:00
Code

Resync adm5120 kernel config, lzma-loader fixes from Gabor

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7536 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2007-06-08 12:58:55 +00:00
parent 5e0c594836
commit f0ac435233
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/adm5120-2.6/config/default
View File

@ -15,7 +15,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
CONFIG_CIFS_STATS2=y CONFIG_CIFS_STATS2=y
CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=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_BIG_ENDIAN is not set
CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_PREFETCH=y
@ -63,8 +63,6 @@ CONFIG_GENERIC_GPIO=y
CONFIG_HAS_IOMEM=y CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT=y
CONFIG_HID=y CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
# CONFIG_HID_FF is not set
CONFIG_HWMON=y CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set # CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_HW_HAS_PCI=y CONFIG_HW_HAS_PCI=y
@ -88,6 +86,7 @@ CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_TUNNEL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IRQ_CPU=y
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_POSIX_ACL=y
@ -268,7 +267,6 @@ CONFIG_USB_ADM5120_HCD=y
# CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_USBNET is not set # CONFIG_USB_USBNET is not set
# CONFIG_USB_USBNET_MII is not set # CONFIG_USB_USBNET_MII is not set
CONFIG_USB_YEALINK=m
# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZD1201 is not set
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_YAFFS_9BYTE_TAGS=y CONFIG_YAFFS_9BYTE_TAGS=y

13
target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c
View File

@ -277,9 +277,20 @@ void decompress_entry(unsigned long reg_a0, unsigned long reg_a1,
(unsigned char*)LOADADDR, osize, &i); (unsigned char*)LOADADDR, osize, &i);
#endif #endif
if (res != LZMA_RESULT_OK) { if (res != LZMA_RESULT_OK) {
print_str("failed, LzmaDecode error: "); 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_hex(res);
print_str("\n"); print_str("\n");
}
halt(); halt();
} }

2
target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds
View File

@ -6,6 +6,8 @@ SECTIONS {
*(.text.*) *(.text.*)
*(.rodata) *(.rodata)
*(.rodata.*) *(.rodata.*)
. = ALIGN(16);
*(.data.lzma)
} }
.data : { .data : {

3
target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds
View File

@ -1,7 +1,6 @@
OUTPUT_ARCH(mips) OUTPUT_ARCH(mips)
SECTIONS { SECTIONS {
.rodata : { .data.lzma : {
. = ALIGN(16);
_lzma_data_start = .; _lzma_data_start = .;
*(.data) *(.data)
_lzma_data_end = .; _lzma_data_end = .;