diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-18 07:25:13 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-18 07:25:13 +0000 |
| commit | 87582f26e64f2e82fe6512a58f7cc1191a946d63 (patch) | |
| tree | 3d5dee3bc9a754e876dcebb719a39bccc38fb4c8 /target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch | |
| parent | 2ac80a466b2eb07029b6119bcebb0c8107e241c6 (diff) | |
| download | master-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.tar.gz master-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.tar.bz2 master-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.zip | |
brcm47xx: add kernel 4.4 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47930 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 0000000000..de109e35f4 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_ + int last_trx_part = -1; + int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; + int err; ++ bool found_nvram = false; + + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but +@@ -306,12 +307,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. |