aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-02-16 20:28:24 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-02-16 20:28:24 +0000
commit1a8218d6e4f770c026149a836f93fe9f9e2b4a4f (patch)
tree2dc2d4678f4c56f10e3ff13a6dab51eaa1579851 /target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
parent1d6574b9c3fb992b9bf509d02c76e9250834ae24 (diff)
downloadupstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.tar.gz
upstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.tar.bz2
upstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.zip
brcm47xx: add initial support for kernel 3.8
This contains the following new bigger changes: * new partition parser which still could lake some features or have bugs * new nand flash driver * using physmap-flash flash driver for parallel flash * some changes to the serial flash driver With these changes OpenWrt starts using more of the mainline flash drivers. SVN-Revision: 35632
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
new file mode 100644
index 0000000000..9932665b26
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -58,6 +58,7 @@ static int bcm47xxpart_parse(struct mtd_
+ int trx_part = -1;
+ int last_trx_part = -1;
+ int max_bytes_to_read = 0x8004;
++ bool found_nvram = false;
+
+ if (blocksize <= 0x10000)
+ blocksize = 0x10000;
+@@ -107,6 +108,7 @@ static int bcm47xxpart_parse(struct mtd_
+ bcm47xxpart_add_part(&parts[curr_part++], "nvram",
+ offset, 0);
+ offset = rounddown(offset, blocksize);
++ found_nvram = true;
+ continue;
+ }
+
+@@ -194,6 +196,15 @@ static int bcm47xxpart_parse(struct mtd_
+ parts[trx_part].offset;
+ }
+
++ 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, MTD_WRITEABLE);
++ for (i = 0; i < curr_part; i++) {
++ if (parts[i].size + parts[i].offset == master->size)
++ parts[i].offset -= blocksize;
++ }
++ }
+ *pparts = parts;
+ return curr_part;
+ };