aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-10-21 17:26:56 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-10-21 17:38:17 +0200
commitd88f3b8a427acd1aef7ec3fc4c8e47c7a665d7d0 (patch)
tree84f6450cb9306e9c5150899fcc939e23334bc1ec /target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch
parent9b880f09f394049e0629e3c9d4061f431a6b19a8 (diff)
downloadupstream-d88f3b8a427acd1aef7ec3fc4c8e47c7a665d7d0.tar.gz
upstream-d88f3b8a427acd1aef7ec3fc4c8e47c7a665d7d0.tar.bz2
upstream-d88f3b8a427acd1aef7ec3fc4c8e47c7a665d7d0.zip
bcm47xx: add kernel 5.10 support
It's for *development* only as it doesn't work with lzma-loader due to bigger size. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch')
-rw-r--r--target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch b/target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch
new file mode 100644
index 0000000000..17abe89d1d
--- /dev/null
+++ b/target/linux/bcm47xx/patches-5.10/400-mtd-bcm47xxpart-get-nvram.patch
@@ -0,0 +1,34 @@
+--- a/drivers/mtd/parsers/bcm47xxpart.c
++++ b/drivers/mtd/parsers/bcm47xxpart.c
+@@ -98,6 +98,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
+@@ -279,12 +280,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.