From: RISCi_ATOM Date: Fri, 25 Oct 2019 18:37:23 +0000 (-0400) Subject: Bump kernel to 4.4.197 X-Git-Tag: v1.5.1-20200423~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3eefa4a33c4dfe5ca5e70a5a75dde53b89c3194d;p=librecmc%2Flibrecmc.git Bump kernel to 4.4.197 --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e7047d14d6..4bb249664d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,9 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.4 = .194 +LINUX_VERSION-4.4 = .197 -LINUX_KERNEL_HASH-4.4.194 = 334c207aa39bc1ea94ddb2bd060777e07b35702a76cfd76f5cf4ad9c1fca2a4a +LINUX_KERNEL_HASH-4.4.197 = 9352ed68c49822f81212a0afdd0af55650fb8f43d9fbbbab947801c6faf16246 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch index aa708e01af..6185651ee8 100644 --- a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.4/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) -@@ -1790,6 +1794,7 @@ static int cfi_amdstd_write_words(struct +@@ -1796,6 +1800,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) -@@ -1918,7 +1923,6 @@ static int __xipram do_write_buffer(stru +@@ -1924,7 +1929,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) { -@@ -1993,6 +1997,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1999,6 +2003,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch index 382b44a939..2940a77150 100644 --- a/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch +++ b/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch @@ -8,7 +8,7 @@ Signed-off-by: George Kashperko 1 file changed, 1 insertion(+) --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1831,6 +1831,7 @@ static int __xipram do_write_buffer(stru +@@ -1837,6 +1837,7 @@ static int __xipram do_write_buffer(stru /* Write Buffer Load */ map_write(map, CMD(0x25), cmd_adr);