From ee4ec4da5a04c03b0b2a6832c429b19b6b58debd Mon Sep 17 00:00:00 2001 From: Chris Fiege Date: Fri, 9 Oct 2020 21:00:07 +0200 Subject: [PATCH 1/2] 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 --- This patch was taken from upstream OpenWRT commit-id 359f5e539036db4f7ac69a6d1c3fb7fe70266ffd. Additionally change needed for CPE210 V3.2 was backporte from 4.14 to 4.9. This allows us to use The CPE 210 V3.2 with Gluon 2019.x. --- ...dd-support-for-EN25QH64-in-spi-nor.c.patch | 44 +++++++++++++++++++ ...9-Backport-en25qh64-from-4.14-to-4.9.patch | 22 ++++++++++ 2 files changed, 66 insertions(+) create mode 100644 patches/openwrt/0027-kernel-mtd-add-support-for-EN25QH64-in-spi-nor.c.patch create mode 100644 patches/openwrt/0029-Backport-en25qh64-from-4.14-to-4.9.patch 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 new file mode 100644 index 00000000..c109b89e --- /dev/null +++ b/patches/openwrt/0027-kernel-mtd-add-support-for-EN25QH64-in-spi-nor.c.patch @@ -0,0 +1,44 @@ +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-Backport-en25qh64-from-4.14-to-4.9.patch b/patches/openwrt/0029-Backport-en25qh64-from-4.14-to-4.9.patch new file mode 100644 index 00000000..ab4ef9c3 --- /dev/null +++ b/patches/openwrt/0029-Backport-en25qh64-from-4.14-to-4.9.patch @@ -0,0 +1,22 @@ +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) }, From 1268fda29284332caba5e746f9fe26eaec900fd9 Mon Sep 17 00:00:00 2001 From: Chris Fiege Date: Fri, 9 Oct 2020 21:01:51 +0200 Subject: [PATCH 2/2] tplink-safeloader: expand support list for TP-Link CPE210 v3 This adds new strings to the support list for the TP-Link CPE210 v3 that are supposed to work with the existing setup. Without it, the factory image won't be accepted by the vendor UI on these newer revisions. Tested on a CPE210 v3.20 (EU). Ref: https://forum.openwrt.org/t/build-for-cpe210-v3-20/68000 Signed-off-by: Adrian Schmutzler --- This patch was taken from upstream OpenWRT commit-id 4a2380a1e778a8f8e0bfb0a00f2996ed0aab58d8 --- ...d-support-list-for-TP-Link-CPE210-v3.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 patches/openwrt/0028-tplink-safeloader-expand-support-list-for-TP-Link-CPE210-v3.patch diff --git a/patches/openwrt/0028-tplink-safeloader-expand-support-list-for-TP-Link-CPE210-v3.patch b/patches/openwrt/0028-tplink-safeloader-expand-support-list-for-TP-Link-CPE210-v3.patch new file mode 100644 index 00000000..2c2b3749 --- /dev/null +++ b/patches/openwrt/0028-tplink-safeloader-expand-support-list-for-TP-Link-CPE210-v3.patch @@ -0,0 +1,37 @@ +From: Adrian Schmutzler +Date: Wed, 8 Jul 2020 11:08:17 +0200 +Subject: tplink-safeloader: expand support list for TP-Link CPE210 v3 + +This adds new strings to the support list for the TP-Link CPE210 v3 +that are supposed to work with the existing setup. + +Without it, the factory image won't be accepted by the vendor UI on +these newer revisions. + +Tested on a CPE210 v3.20 (EU). + +Ref: https://forum.openwrt.org/t/build-for-cpe210-v3-20/68000 + +Signed-off-by: Adrian Schmutzler + +diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c +index de15faf6796c993efc6c2a36b22bb1e978e3be90..4f762d82e3d6073591958fa30af993da66dd10ec 100644 +--- a/tools/firmware-utils/src/tplink-safeloader.c ++++ b/tools/firmware-utils/src/tplink-safeloader.c +@@ -205,8 +205,15 @@ static struct device_info boards[] = { + "SupportList:\r\n" + "CPE210(TP-LINK|EU|N300-2|45550000):3.0\r\n" + "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n" ++ "CPE210(TP-LINK|US|N300-2|55530000):3.0\r\n" + "CPE210(TP-LINK|UN|N300-2):3.0\r\n" +- "CPE210(TP-LINK|EU|N300-2):3.0\r\n", ++ "CPE210(TP-LINK|EU|N300-2):3.0\r\n" ++ "CPE210(TP-LINK|EU|N300-2|45550000):3.1\r\n" ++ "CPE210(TP-LINK|UN|N300-2|00000000):3.1\r\n" ++ "CPE210(TP-LINK|US|N300-2|55530000):3.1\r\n" ++ "CPE210(TP-LINK|EU|N300-2|45550000):3.20\r\n" ++ "CPE210(TP-LINK|UN|N300-2|00000000):3.20\r\n" ++ "CPE210(TP-LINK|US|N300-2|55530000):3.20\r\n", + .support_trail = '\xff', + .soft_ver = NULL, +