From 008798772f1870c47fed0bcd3a61b85425b0020c Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Tue, 7 Aug 2018 12:51:30 -0400 Subject: [PATCH] Bump kernel to 4.4.146 --- include/kernel-version.mk | 4 +-- ...x-cfi-cmdset-0002-erase-status-check.patch | 29 ------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2d571d73cb..619dda26e9 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,9 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.4 = .145 +LINUX_VERSION-4.4 = .146 -LINUX_KERNEL_HASH-4.4.145 = 77d14cbc635bd5eca796d2444b89dd98a525c1b851ddd123490139c3566414b1 +LINUX_KERNEL_HASH-4.4.146 = 8817c2b83ebdba9aed5ec13a309bfd8f86e9c1f86261e1e644cf65616783fabe ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch deleted file mode 100644 index b6189fe096..0000000000 --- a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e72a3a1be8f6328bd7ef491332ba541547b6086 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Mon, 15 Jul 2013 00:38:51 +0200 -Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check - ---- - drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct - chip->erase_suspended = 0; - } - -- if (chip_ready(map, adr)) -+ if (chip_good(map, adr, map_word_ff(map))) - break; - - if (time_after(jiffies, timeo)) { -@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st - chip->erase_suspended = 0; - } - -- if (chip_ready(map, adr)) { -+ if (chip_good(map, adr, map_word_ff(map))) { - xip_enable(map, chip, adr); - break; - } -- 2.25.1