From de79f4ab882b2955432eb8104fd5426745262e83 Mon Sep 17 00:00:00 2001
From: Paul Wassi
Date: Tue, 13 Mar 2018 09:43:43 +0100
Subject: brcm47xx: add kernel 4.14 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
Signed-off-by: Rafał Miłecki
---
.../400-mtd-bcm47xxpart-get-nvram.patch | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch
(limited to 'target/linux/brcm47xx/patches-4.14/400-mtd-bcm47xxpart-get-nvram.patch')
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.
--
cgit v1.2.3