brcm47xx: update usb driver to the version send for mainline kernel integartion

[openwrt.git] / target / linux / brcm47xx / image / lzma-loader / src / decompress.c

diff --git a/target/linux/brcm47xx/image/lzma-loader/src/decompress.c b/target/linux/brcm47xx/image/lzma-loader/src/decompress.c
index ce2876a..05681b1 100644 (file)
--- a/target/linux/brcm47xx/image/lzma-loader/src/decompress.c
+++ b/target/linux/brcm47xx/image/lzma-loader/src/decompress.c
@@ -87,6 +87,9 @@ struct trx_header {
        unsigned int offsets[3];        /* Offsets of partitions from start of header */
 };
 
        unsigned int offsets[3];        /* Offsets of partitions from start of header */
 };
 

+#define EDIMAX_PS_HEADER_MAGIC 0x36315350 /*  "PS16"  */
+#define EDIMAX_PS_HEADER_LEN   0xc /* 12 bytes long for edimax header */
+

 /* beyound the image end, size not known in advance */
 extern unsigned char workspace[];
 
 /* beyound the image end, size not known in advance */
 extern unsigned char workspace[];
 


@@ -135,8 +138,12 @@ void entry(unsigned long icache_size, unsigned long icache_lsize,
 
        /* look for trx header, 32-bit data access */
        for (data = ((unsigned char *) KSEG1ADDR(BCM4710_FLASH));
 
        /* look for trx header, 32-bit data access */
        for (data = ((unsigned char *) KSEG1ADDR(BCM4710_FLASH));

-               ((struct trx_header *)data)->magic != TRX_MAGIC; data += 65536);
+               ((struct trx_header *)data)->magic != TRX_MAGIC &&
+               ((struct trx_header *)data)->magic != EDIMAX_PS_HEADER_MAGIC;
+                data += 65536);

 
 

+       if (((struct trx_header *)data)->magic == EDIMAX_PS_HEADER_MAGIC)
+               data += EDIMAX_PS_HEADER_LEN;

        /* compressed kernel is in the partition 0 or 1 */
        if (((struct trx_header *)data)->offsets[1] > 65536) 
                data += ((struct trx_header *)data)->offsets[0];
        /* compressed kernel is in the partition 0 or 1 */
        if (((struct trx_header *)data)->offsets[1] > 65536) 
                data += ((struct trx_header *)data)->offsets[0];