diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-03-17 07:07:00 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-03-17 07:07:00 +0000 |
| commit | 917fb7632186137dc7750b3f010be729718369fb (patch) | |
| tree | 4dc9cdc4983288d1b9ee33432ebcba5d006c7eb6 /target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch | |
| parent | 8f63c1405f4dcbe354ad18e1f36a3b768bdf6d0b (diff) | |
| download | upstream-917fb7632186137dc7750b3f010be729718369fb.tar.gz upstream-917fb7632186137dc7750b3f010be729718369fb.tar.bz2 upstream-917fb7632186137dc7750b3f010be729718369fb.zip | |
brcm47xx: rename (and refresh) MTD patch for safety "nvram" partition
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44854
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..df51191ad8 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -97,6 +97,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; + + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but +@@ -300,12 +301,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. |