aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
blob: 48f8d36da4105e1c94bab61fcefba4d13cb20873 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -199,6 +199,16 @@ static int bcm47xxpart_parse(struct mtd_
 			continue;
 		}
 
+		/* New (ARM?) devices may have NVRAM in some middle block. Last
+		 * block will be checked later, so skip it.
+		 */
+		if (offset != master->size - blocksize &&
+		    buf[0x000 / 4] == NVRAM_HEADER) {
+			bcm47xxpart_add_part(&parts[curr_part++], "nvram",
+					     offset, 0);
+			continue;
+		}
+
 		/* Read middle of the block */
 		if (mtd_read(master, offset + 0x8000, 0x4,
 			     &bytes_read, (uint8_t *)buf) < 0) {