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

[librecmc/librecmc.git] / target / linux / brcm47xx / patches-3.3 / 050-mtd-add-bcm47xx-part-parser.patch

diff --git a/target/linux/brcm47xx/patches-3.3/050-mtd-add-bcm47xx-part-parser.patch b/target/linux/brcm47xx/patches-3.3/050-mtd-add-bcm47xx-part-parser.patch
index 0c66603f2e10765cdb543eac5a6865b95d666a15..5381e2f6cc7a5183c9d65da3449feafba46e46fa 100644 (file)
--- a/target/linux/brcm47xx/patches-3.3/050-mtd-add-bcm47xx-part-parser.patch
+++ b/target/linux/brcm47xx/patches-3.3/050-mtd-add-bcm47xx-part-parser.patch
@@ -26,7 +26,7 @@
  obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
 --- /dev/null
 +++ b/drivers/mtd/bcm47xxpart.c
-@@ -0,0 +1,548 @@
+@@ -0,0 +1,542 @@
 +/*
 + *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@@ -96,11 +96,6 @@
 +      u32 offsets[TRX_MAX_OFFSET];    /* Offsets of partitions from start of header */
 +};
 +
-+/* for WGT634U search the ELF-header of
-+ * the kernel decompressor instead of TRX
-+ */
-+#define WGT634U_ELF_MAGIC     0x464c457f /*  ".ELF"  */
-+
 +/* for Edimax Print servers which use an additional header
 + * then the firmware on flash looks like :
 + * EDIMAX HEADER | TRX HEADER
@@ -154,8 +149,7 @@
 +              }
 +
 +              /* found a TRX header */
-+              if (le32_to_cpu(trx->magic) == TRX_MAGIC ||
-+                  le32_to_cpu(trx->magic) == WGT634U_ELF_MAGIC)
++              if (le32_to_cpu(trx->magic) == TRX_MAGIC)
 +                      goto found;
 +      }
 +