Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43223master
parent
fcc8fe9bd2
commit
93b3924128
@ -1,32 +0,0 @@ |
|||||||
From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Thu, 2 Oct 2014 11:33:40 +0200
|
|
||||||
Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This is needed for some new Netgear devices (e.g. R6250).
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/bcm47xxpart.c | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- 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.
|
|
@ -1,32 +0,0 @@ |
|||||||
From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Thu, 2 Oct 2014 11:33:40 +0200
|
|
||||||
Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This is needed for some new Netgear devices (e.g. R6250).
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/bcm47xxpart.c | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- 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.
|
|
@ -0,0 +1,50 @@ |
|||||||
|
--- 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;
|
||||||
|
|
@ -0,0 +1,50 @@ |
|||||||
|
--- 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;
|
||||||
|
|
Loading…
Reference in new issue