diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-07 16:53:22 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-12 09:45:54 +0200 |
| commit | 9c718b5478ac5df8ca4f27dbb70a6201c385aada (patch) | |
| tree | e73b499786367a1f7b65a20cea640a09ac8e678f /target/linux/ar71xx | |
| parent | b21bea7b1b92abefad53bcfe509b7e44dd488c79 (diff) | |
| download | upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.gz upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.bz2 upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.zip | |
kernel: bump 4.14 to 4.14.200
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx')
3 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch index faf4391a57..1a295fa11d 100644 --- a/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1641,7 +1641,7 @@ static int __xipram do_write_oneword(str +@@ -1640,7 +1640,7 @@ static int __xipram do_write_oneword(str } if (chip_good(map, adr, datum)) @@ -9,7 +9,7 @@ /* Latency issues. Drop the lock, wait a while and retry */ UDELAY(map, chip, adr, 1); -@@ -1658,6 +1658,8 @@ static int __xipram do_write_oneword(str +@@ -1657,6 +1657,8 @@ static int __xipram do_write_oneword(str goto retry; } } @@ -18,7 +18,7 @@ xip_enable(map, chip, adr); op_done: if (mode == FL_OTP_WRITE) -@@ -2240,7 +2242,6 @@ static int cfi_amdstd_panic_write(struct +@@ -2239,7 +2241,6 @@ static int cfi_amdstd_panic_write(struct return 0; } @@ -26,7 +26,7 @@ /* * Handle devices with one erase region, that only implement * the chip erase command. -@@ -2308,7 +2309,7 @@ static int __xipram do_erase_chip(struct +@@ -2307,7 +2308,7 @@ static int __xipram do_erase_chip(struct } if (chip_good(map, adr, map_word_ff(map))) @@ -35,7 +35,7 @@ if (time_after(jiffies, timeo)) { printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2332,6 +2333,7 @@ static int __xipram do_erase_chip(struct +@@ -2331,6 +2332,7 @@ static int __xipram do_erase_chip(struct } } @@ -43,7 +43,7 @@ chip->state = FL_READY; xip_enable(map, chip, adr); DISABLE_VPP(map); -@@ -2405,7 +2407,7 @@ static int __xipram do_erase_oneblock(st +@@ -2404,7 +2406,7 @@ static int __xipram do_erase_oneblock(st if (chip_good(map, adr, map_word_ff(map))) { xip_enable(map, chip, adr); @@ -52,7 +52,7 @@ } if (time_after(jiffies, timeo)) { -@@ -2431,6 +2433,7 @@ static int __xipram do_erase_oneblock(st +@@ -2430,6 +2432,7 @@ static int __xipram do_erase_oneblock(st } } diff --git a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch index 9a367c2ab0..0f7c4d68ed 100644 --- a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1800,6 +1804,7 @@ static int cfi_amdstd_write_words(struct +@@ -1799,6 +1803,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1932,7 +1937,6 @@ static int __xipram do_write_buffer(stru +@@ -1931,7 +1936,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -2007,6 +2011,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -2006,6 +2010,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index c5e201b371..1e9ec3d628 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -325,7 +325,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -464,7 +464,7 @@ static struct neighbour *ipv4_neigh_look +@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; |