74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
--- a/drivers/mtd/bcm47xxpart.c
|
|
+++ b/drivers/mtd/bcm47xxpart.c
|
|
@@ -15,8 +15,12 @@
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
-/* 10 parts were found on sflash on Netgear WNDR4500 */
|
|
-#define BCM47XXPART_MAX_PARTS 12
|
|
+/*
|
|
+ * NAND flash on Netgear R6250 was verified to contain 15 partitions.
|
|
+ * This will result in allocating too big array for some old devices, but the
|
|
+ * memory will be freed soon anyway (see mtd_device_parse_register).
|
|
+ */
|
|
+#define BCM47XXPART_MAX_PARTS 20
|
|
|
|
/*
|
|
* Amount of bytes we read when analyzing each block of flash memory.
|
|
@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
|
|
i++;
|
|
}
|
|
|
|
- bcm47xxpart_add_part(&parts[curr_part++], "linux",
|
|
- offset + trx->offset[i], 0);
|
|
- i++;
|
|
+ if (trx->offset[i]) {
|
|
+ bcm47xxpart_add_part(&parts[curr_part++],
|
|
+ "linux",
|
|
+ offset + trx->offset[i],
|
|
+ 0);
|
|
+ i++;
|
|
+ }
|
|
|
|
/*
|
|
* Pure rootfs size is known and can be calculated as:
|
|
* trx->length - trx->offset[i]. We don't fill it as
|
|
* we want to have jffs2 (overlay) in the same mtd.
|
|
*/
|
|
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
|
|
- offset + trx->offset[i], 0);
|
|
- i++;
|
|
+ if (trx->offset[i]) {
|
|
+ bcm47xxpart_add_part(&parts[curr_part++],
|
|
+ "rootfs",
|
|
+ offset + trx->offset[i],
|
|
+ 0);
|
|
+ i++;
|
|
+ }
|
|
|
|
last_trx_part = curr_part - 1;
|
|
|