diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-07 15:34:28 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-07 15:34:28 +0000 |
| commit | 8e738da02c77b69d2fa8c1ef52faf2af6388b916 (patch) | |
| tree | ab3580332d8134c023a550f443fd0da45837ac72 /target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch | |
| parent | dc6171c73454e1ed25a89e2bc5b5c7730aa38c3d (diff) | |
| download | upstream-8e738da02c77b69d2fa8c1ef52faf2af6388b916.tar.gz upstream-8e738da02c77b69d2fa8c1ef52faf2af6388b916.tar.bz2 upstream-8e738da02c77b69d2fa8c1ef52faf2af6388b916.zip | |
brcm47xx: remove kernel 3.10
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43535
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch deleted file mode 100644 index 086d7b3a4d..0000000000 --- a/target/linux/brcm47xx/patches-3.10/027-mtd-bcm47xxpart-get-nvram.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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. |