diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-03-12 23:28:41 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-03-12 23:28:41 +0000 |
| commit | 63f0f18e5e42ef4e5d9a16eb919a007d6b64b7c2 (patch) | |
| tree | 9b9607e9c889b60c3193d1280744b0c74424bbd7 /target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch | |
| parent | ff8be57b863fc11322069a93a1e2806f3852c6de (diff) | |
| download | upstream-63f0f18e5e42ef4e5d9a16eb919a007d6b64b7c2.tar.gz upstream-63f0f18e5e42ef4e5d9a16eb919a007d6b64b7c2.tar.bz2 upstream-63f0f18e5e42ef4e5d9a16eb919a007d6b64b7c2.zip | |
brcm47xx: add initial support for kernel 3.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39905 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 34 |
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. |