diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-03-09 19:48:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-03-09 19:48:03 +0000 |
| commit | bbcb144cde1b7f8518079aee71d5f74069d25cbc (patch) | |
| tree | cb3d8dca122ee6be2a184ded82dc9845bbd6bc04 /target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch | |
| parent | a5d279ddecf8dd1c7fa93aa45dafb0059093529f (diff) | |
| download | upstream-bbcb144cde1b7f8518079aee71d5f74069d25cbc.tar.gz upstream-bbcb144cde1b7f8518079aee71d5f74069d25cbc.tar.bz2 upstream-bbcb144cde1b7f8518079aee71d5f74069d25cbc.zip | |
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/027-mtd-bcm47xxpart-get-nvram.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..4cd78c2011 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -65,6 +65,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; +@@ -190,12 +191,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. |