diff --git a/patches/openwrt/0027-kernel-mtd-add-support-for-EN25QH64-in-spi-nor.c.patch b/patches/openwrt/0027-kernel-mtd-add-support-for-EN25QH64-in-spi-nor.c.patch deleted file mode 100644 index c109b89e..00000000 --- a/patches/openwrt/0027-kernel-mtd-add-support-for-EN25QH64-in-spi-nor.c.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Roger Pueyo Centelles -Date: Mon, 24 Dec 2018 15:39:32 +0100 -Subject: kernel: mtd: add support for EN25QH64 in spi-nor.c - -The Eon EN25QH64 is a 64 Mbit SPI NOR flash memory chip. Its 32, 128 and -256 Mbits siblings are supported upstream but this particular size wasn't. -This commit includes patches for kernels 4.14 and 4.19. - -Tested on a COMFAST CF-E120A v3 (ath79). - -Signed-off-by: Roger Pueyo Centelles - -diff --git a/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-eon-en25qh64.patch b/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-eon-en25qh64.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..c290a784d045576b6f145d489ed4580477ee7829 ---- /dev/null -+++ b/target/linux/generic/pending-4.14/479-mtd-spi-nor-add-eon-en25qh64.patch -@@ -0,0 +1,10 @@ -+--- a/drivers/mtd/spi-nor/spi-nor.c -++++ b/drivers/mtd/spi-nor/spi-nor.c -+@@ -956,6 +956,7 @@ static const struct flash_info spi_nor_i -+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, -+ { "en25qh32", INFO(0x1c7016, 0, 64 * 1024, 64, 0) }, -++ { "en25qh64", INFO(0x1c7017, 0, 64 * 1024, 128, 0) }, -+ { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) }, -+ { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) }, -+ { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) }, -diff --git a/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch b/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..6bb77547332d6d9dc2944f45edc5d170fdfdc7aa ---- /dev/null -+++ b/target/linux/generic/pending-4.19/479-mtd-spi-nor-add-eon-en25qh64.patch -@@ -0,0 +1,10 @@ -+--- a/drivers/mtd/spi-nor/spi-nor.c -++++ b/drivers/mtd/spi-nor/spi-nor.c -+@@ -996,6 +996,7 @@ static const struct flash_info spi_nor_i -+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, -+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, -+ { "en25qh32", INFO(0x1c7016, 0, 64 * 1024, 64, 0) }, -++ { "en25qh64", INFO(0x1c7017, 0, 64 * 1024, 128, 0) }, -+ { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) }, -+ { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) }, -+ { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) }, diff --git a/patches/openwrt/0029-HACK-Backport-en25qh64-from-4.14-to-4.9.patch b/patches/openwrt/0029-HACK-Backport-en25qh64-from-4.14-to-4.9.patch deleted file mode 100644 index ab4ef9c3..00000000 --- a/patches/openwrt/0029-HACK-Backport-en25qh64-from-4.14-to-4.9.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Chris Fiege -Date: Wed, 14 Oct 2020 21:47:56 +0200 -Subject: HACK: Backport en25qh64 from 4.14 to 4.9 - -diff --git a/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch b/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch -index ac1fda51593af87fe9bd5a5a3bb433e1f098a740..9a9371165369442143a04e74c100db4d589b99d0 100644 ---- a/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch -+++ b/target/linux/generic/pending-4.9/476-mtd-spi-nor-add-eon-en25q128.patch -@@ -8,11 +8,12 @@ Signed-off-by: Piotr Dymacz - - --- a/drivers/mtd/spi-nor/spi-nor.c - +++ b/drivers/mtd/spi-nor/spi-nor.c --@@ -954,6 +954,7 @@ static const struct flash_info spi_nor_i -+@@ -954,6 +954,8 @@ static const struct flash_info spi_nor_i - { "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) }, - { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, - { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, - + { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, -++ { "en25qh64", INFO(0x1c7017, 0, 64 * 1024, 128, 0) }, - { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) }, - { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) }, - { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) },