aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-02-16 20:28:24 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-02-16 20:28:24 +0000
commit9f9982c1f703d0c9c8479c070e85ffdfeba72745 (patch)
tree9cd4c6ee2a098198b1c7e71c44edaee49213080f /target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
parent452522c6deabe5ff993d2091c3c19266690ee49a (diff)
downloadmaster-187ad058-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.gz
master-187ad058-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.bz2
master-187ad058-9f9982c1f703d0c9c8479c070e85ffdfeba72745.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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35632 3c298f89-4303-0410-b956-a3cf2f4a3e73
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;
+ };