summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-01-13 22:35:45 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-01-13 23:05:36 +0100
commit5b089e45a649b936d5ce71930adef4fdea8a7875 (patch)
tree7a6b53d998046f528dc255d6320f11d74da7ec62 /target/linux/brcm47xx
parent619c8fa92209fb1a30d6e68a59a13aaa102a764c (diff)
downloadmtk-20170518-5b089e45a649b936d5ce71930adef4fdea8a7875.zip
mtk-20170518-5b089e45a649b936d5ce71930adef4fdea8a7875.tar.gz
mtk-20170518-5b089e45a649b936d5ce71930adef4fdea8a7875.tar.bz2
kernel: update 4.4 kernel to 4.4.42
Refresh patches on all 4.4 supported platforms. Compile & run tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-4.4/400-mtd-bcm47xxpart-get-nvram.patch6
1 files changed, 3 insertions, 3 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
index 9ffc4ca..64184c0 100644
--- 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
@@ -1,14 +1,14 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -127,6 +127,7 @@ static int bcm47xxpart_parse(struct mtd_
- int last_trx_part = -1;
+@@ -217,6 +217,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
-@@ -332,12 +333,23 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -384,12 +385,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);