aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-03-12 23:28:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-03-12 23:28:41 +0000
commit00dc53dd2e16be37df7acece5da6e42a8cce4ac9 (patch)
tree1433cbac1e9d17e9e64f42658a42913ba1e4bbea /target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
parent128bb9f1a3279e36aaeaedc75c26a0199d17303f (diff)
downloadupstream-00dc53dd2e16be37df7acece5da6e42a8cce4ac9.tar.gz
upstream-00dc53dd2e16be37df7acece5da6e42a8cce4ac9.tar.bz2
upstream-00dc53dd2e16be37df7acece5da6e42a8cce4ac9.zip
brcm47xx: add initial support for kernel 3.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39905
Diffstat (limited to 'target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
new file mode 100644
index 0000000000..086d7b3a4d
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -68,6 +68,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;
+
+ if (blocksize <= 0x10000)
+ blocksize = 0x10000;
+@@ -229,12 +230,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.