mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 12:49:18 +03:00
Resync adm5120 kernel config, lzma-loader fixes from Gabor
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7536 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
5e0c594836
commit
f0ac435233
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -6,6 +6,8 @@ SECTIONS {
|
||||
*(.text.*)
|
||||
*(.rodata)
|
||||
*(.rodata.*)
|
||||
. = ALIGN(16);
|
||||
*(.data.lzma)
|
||||
}
|
||||
|
||||
.data : {
|
||||
|
@ -1,7 +1,6 @@
|
||||
OUTPUT_ARCH(mips)
|
||||
SECTIONS {
|
||||
.rodata : {
|
||||
. = ALIGN(16);
|
||||
.data.lzma : {
|
||||
_lzma_data_start = .;
|
||||
*(.data)
|
||||
_lzma_data_end = .;
|
||||
|
Loading…
Reference in New Issue
Block a user