diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-02 14:12:45 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-02 23:10:06 +0200 |
commit | 1f991bb365b1ee66846e0785dc36dd5914f83398 (patch) | |
tree | 978b63218557bf42e48f009ad25dac506d87a6a9 /target/linux/brcm47xx/patches-4.9/400-mtd-bcm47xxpart-get-nvram.patch | |
parent | b56995550ac97ee54a5e999f902f92a1879066b5 (diff) | |
download | upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.tar.gz upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.tar.bz2 upstream-1f991bb365b1ee66846e0785dc36dd5914f83398.zip |
brcm47xx: Add support for kernel 4.9
I tested this on a WRT54GS and a WRT610N V1.
The WRT610N does not boot when the kernel is too big, so I deactivated KALLSYMS
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.9/400-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-4.9/400-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.9/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.9/400-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..7e4ae20704 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.9/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. |