Changeset 34201


Ignore:
Timestamp:
2012-11-15T17:39:45+01:00 (5 years ago)
Author:
hauke
Message:

brcm47xx: revert r33935: check for .ELF header in partition parser

For sysupgrade the generic image should be used and the special image for the wgt634u is just needed for initial flashing over CFE.
russell reported that with this patch sysupgrdae did not worked for him any more and he could not reproduce the error described in #11420.
With the patch the linux partition also contained the loader which is in the first 128KB.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.3/050-mtd-add-bcm47xx-part-parser.patch

    r33935 r34201  
    2727--- /dev/null 
    2828+++ b/drivers/mtd/bcm47xxpart.c 
    29 @@ -0,0 +1,548 @@ 
     29@@ -0,0 +1,542 @@ 
    3030+/* 
    3131+ *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     
    9797+}; 
    9898+ 
    99 +/* for WGT634U search the ELF-header of 
    100 + * the kernel decompressor instead of TRX 
    101 + */ 
    102 +#define WGT634U_ELF_MAGIC      0x464c457f /*  ".ELF"  */ 
    103 + 
    10499+/* for Edimax Print servers which use an additional header 
    105100+ * then the firmware on flash looks like : 
     
    155150+ 
    156151+               /* found a TRX header */ 
    157 +               if (le32_to_cpu(trx->magic) == TRX_MAGIC || 
    158 +                   le32_to_cpu(trx->magic) == WGT634U_ELF_MAGIC) 
     152+               if (le32_to_cpu(trx->magic) == TRX_MAGIC) 
    159153+                       goto found; 
    160154+       } 
Note: See TracChangeset for help on using the changeset viewer.