summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-09 19:48:03 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-09 19:48:03 +0000
commitf324bddaf74aac8f179bd15d2ba9beebcae90203 (patch)
treecb3d8dca122ee6be2a184ded82dc9845bbd6bc04 /target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
parentc7d30fa1894965695185b41748fbf39bf1ef46ec (diff)
brcm47xx: add some more partition parser fixes by Rafał Miłecki
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35912 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, 0 insertions, 34 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
deleted file mode 100644
index 9932665b26..0000000000
--- a/target/linux/brcm47xx/patches-3.8/024-mtd-bcm47xxpart-get-nvram.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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;
- };