diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:11 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:11 +0000 |
| commit | b66b0ae6323fea7dedd400785c556a39a30cdf4f (patch) | |
| tree | 39e4b36e44832bd91191c42710da2876cff563a7 /target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch | |
| parent | fc08d7a3eb6a50d6d62a33e3de66e92dffb4ad7d (diff) | |
| download | upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.tar.gz upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.tar.bz2 upstream-b66b0ae6323fea7dedd400785c556a39a30cdf4f.zip | |
brcm47xx: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 45374
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, 0 insertions, 34 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 deleted file mode 100644 index 198bf4bcd5..0000000000 --- a/target/linux/brcm47xx/patches-3.14/027-mtd-bcm47xxpart-get-nvram.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -93,6 +93,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; -@@ -280,12 +281,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. |