diff options
| author | Paul Wassi <p.wassi@gmx.at> | 2018-03-13 09:43:43 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2018-04-03 22:57:10 +0200 |
| commit | de79f4ab882b2955432eb8104fd5426745262e83 (patch) | |
| tree | 248ead4b61c5a46f3a434c5aa66937b515131887 /target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch | |
| parent | 986f80595b765085d1cadd24988d2d8ade172146 (diff) | |
| download | upstream-de79f4ab882b2955432eb8104fd5426745262e83.tar.gz upstream-de79f4ab882b2955432eb8104fd5426745262e83.tar.bz2 upstream-de79f4ab882b2955432eb8104fd5426745262e83.zip | |
brcm47xx: add kernel 4.14 support
Add patches for 4.14, drop patch 030 since it's already included
upstream.
Tested on:
1) WRT54GL (with RAM upgraded to 32 MiB)
2) WL500gPv2 (with RAM upgraded to 64 MiB)
3) BCM47186B0 SoC board
4) BCM4706 SoC board
Signed-off-by: Paul Wassi <p.wassi@gmx.at>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..7e4ae20704 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -102,6 +102,7 @@ static int bcm47xxpart_parse(struct mtd_ + int trx_num = 0; /* Number of found TRX partitions */ + int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; + int err; ++ bool found_nvram = false; + + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but +@@ -269,12 +270,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. |