aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-23 11:31:54 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-23 11:31:54 +0000
commit8d1580c4bb85723fa4bb2a22f7628a192a1a06f0 (patch)
tree231adfee524a144fd22d6615570127e09cdbbd99 /target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch
parent4d58f0f4d95c1c4c79cc256ed71c08f3105defb5 (diff)
downloadupstream-8d1580c4bb85723fa4bb2a22f7628a192a1a06f0.tar.gz
upstream-8d1580c4bb85723fa4bb2a22f7628a192a1a06f0.tar.bz2
upstream-8d1580c4bb85723fa4bb2a22f7628a192a1a06f0.zip
brcm47xx: add patches for kernel 4.0
SVN-Revision: 45570
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch
new file mode 100644
index 0000000000..df51191ad8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-4.0/400-mtd-bcm47xxpart-get-nvram.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
+ int trx_part = -1;
+ int last_trx_part = -1;
+ int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
++ bool found_nvram = false;
+
+ /*
+ * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
+@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_
+ if (buf[0] == NVRAM_HEADER) {
+ bcm47xxpart_add_part(&parts[curr_part++], "nvram",
+ master->size - blocksize, 0);
++ found_nvram = true;
+ break;
+ }
+ }
+
+ kfree(buf);
+
++ if (!found_nvram) {
++ pr_err("can not find a nvram partition reserve last block\n");
++ bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess",
++ master->size - blocksize * 2, MTD_WRITEABLE);
++ for (i = 0; i < curr_part; i++) {
++ if (parts[i].size + parts[i].offset == master->size)
++ parts[i].offset -= blocksize * 2;
++ }
++ }
++
+ /*
+ * Assume that partitions end at the beginning of the one they are
+ * followed by.