aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-18 21:57:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-18 21:57:54 +0000
commit4a9acacf5341933d0f43476b4aa02de81daff457 (patch)
treee319440c9c56147793f4148f7886617322c7840c /target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
parent770ba9d40fc6a0198e0253c6e6eab283b9a22ebd (diff)
downloadupstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.gz
upstream-4a9acacf5341933d0f43476b4aa02de81daff457.tar.bz2
upstream-4a9acacf5341933d0f43476b4aa02de81daff457.zip
kernel: 3.14: update bcm47xxpart
It it used by brcm47xx and bcm53xx targets, so put patches in generic. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42212
Diffstat (limited to 'target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch')
-rw-r--r--target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
new file mode 100644
index 0000000000..48f8d36da4
--- /dev/null
+++ b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch
@@ -0,0 +1,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) {