scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-29 17:42:41 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

config.yml: update 21.02 baseline from RC2->GA

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-09-04 06:37:52 +02:00
parent a6256fb1f9
commit 1e7efc68a8
81 changed files with 1203 additions and 4217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/0001-.gitignore-add-the-profiles-folder.patch
View File

@@ -1,7 +1,7 @@
From 77f9263187df8db1da9b6e859a46c8f9ec854035 Mon Sep 17 00:00:00 2001
From 534b0e8d0ff1407c2c0e8e8c650f47ce6060a7a4 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 22 Sep 2020 18:02:55 +0200
Subject: [PATCH 01/21] .gitignore: add the /profiles folder
Subject: [PATCH 01/43] .gitignore: add the /profiles folder
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index b6bfe1a525..a2a910ef13 100644
index 9647daa5a4..70a592e12f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@

4
patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch
View File

@@ -1,7 +1,7 @@
From 0778b48ab16067d538021c0bedf1e5312347dcc6 Mon Sep 17 00:00:00 2001
From 2947f1c2ac5e300d209b952979da30e92330a01f Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 25 Jan 2021 06:40:20 +0100
Subject: [PATCH 02/21] Revert "toolchain: gcc: Remove support for GCC 5"
Subject: [PATCH 02/43] Revert "toolchain: gcc: Remove support for GCC 5"
This reverts commit 080dc619d4780a1f7b14082b77b28686e694f72d.
---

4
patches/0003-pending-scripts-add-gen_config.py.patch
View File

@@ -1,7 +1,7 @@
From f9d39a389ef2a3bbf326580a0769519c1f3bad5f Mon Sep 17 00:00:00 2001
From 4b5a9307be956685ed6bd14a3e2cb8727eae0b08 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 19 Jun 2020 10:45:22 +0200
Subject: [PATCH 01/37] pending: scripts: add gen_config.py
Subject: [PATCH 03/43] pending: scripts: add gen_config.py
This script is used to setup the tree based on the profiles/.

4
patches/0004-scripts-update-feed-script.patch
View File

@@ -1,7 +1,7 @@
From 501a2989de4295029f419406c20f72e10a914db4 Mon Sep 17 00:00:00 2001
From 2abc67a0fbfbf50f4af2baaee07eb10d214973e4 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 19 Jun 2020 13:25:27 +0200
Subject: [PATCH 04/21] scripts: update feed script
Subject: [PATCH 04/43] scripts: update feed script
gen_config.py requires the latest version of the feeds script.

6
patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch
View File

@@ -1,7 +1,7 @@
From f7b13fd5ac28e13e7ef2c95f3fda2c3ec3b78b39 Mon Sep 17 00:00:00 2001
From 41347924799ff4f16a12d8f740f5c66b10eb8c43 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sun, 9 Aug 2020 20:58:52 +0200
Subject: [PATCH 05/21] scripts/ubinize-image.sh: allow setting the rootfs name
Subject: [PATCH 05/43] scripts/ubinize-image.sh: allow setting the rootfs name
This patch allows us to use a different rootfs name. Some QCA boards will
require the in ubi rfs to be called ubi_rootfs.
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/image-commands.mk b/include/image-commands.mk
index bddbed6052..bde6e030bc 100644
index c6e8eb0293..d4bce80e68 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -86,6 +86,7 @@ define Build/append-ubi

8
patches/0006-base-files-set-default-password-to-openwifi.patch
View File

@@ -1,7 +1,7 @@
From a067af45a93ebc68f89a8adc88a25f11b4cd9620 Mon Sep 17 00:00:00 2001
From 73116492498c07a2f9c45a7a66a4b03ac103d37d Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 30 Jul 2020 16:51:04 +0200
Subject: [PATCH 06/21] base-files: set default password to "openwifi"
Subject: [PATCH 06/43] base-files: set default password to "openwifi"
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index ee3958e733..66b11c8a2e 100755
index 596fcf41fa..30e7c119f7 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -282,7 +282,7 @@ generate_static_system() {
@@ -303,7 +303,7 @@ generate_static_system() {
add system system
set system.@system[-1].hostname='OpenWrt'
set system.@system[-1].timezone='UTC'

4
patches/0007-base-files-update-banner.patch
View File

@@ -1,7 +1,7 @@
From 86494392a8ae5374e000298b6e06c2bcd4f82cb9 Mon Sep 17 00:00:00 2001
From a819600041c0fade872c023637ba0c6c5890de78 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 31 Jul 2020 17:15:13 +0200
Subject: [PATCH 07/21] base-files: update banner
Subject: [PATCH 07/43] base-files: update banner
Use OpenWiFi for the banner.

10
patches/0008-base-files-add-the-wlan-ap-repo-hash.patch
View File

@@ -1,7 +1,7 @@
From 5ed64f1cde06fa3f0fb27c618c86aeeb9309d845 Mon Sep 17 00:00:00 2001
From f887c60cee77011e009d87639560079b828a452a Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 29 Aug 2020 08:25:41 +0200
Subject: [PATCH 12/38] base-files: add the wlan-ap repo hash
Subject: [PATCH 08/43] base-files: add the wlan-ap repo hash
currently the banner will show the revision of the build tree.
This patch adds the hash of the wlan-ap tree.
@@ -44,10 +44,10 @@ index a4b47c8a57..214f32974b 100644
-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8a1ddf96f5..0ff6fa84c1 100644
index 9db4812981..99cb5476f7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -205,6 +205,7 @@ define Package/base-files/install
@@ -209,6 +209,7 @@ define Package/base-files/install
$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
rm -f $(1)/etc/banner.failsafe,)
@@ -118,7 +118,7 @@ index 0000000000..4e8f05a700
+2.25.1
+
diff --git a/scripts/gen_config.py b/scripts/gen_config.py
index 124dfd596a..e9418d776c 100755
index a36f244e56..a348386124 100755
--- a/scripts/gen_config.py
+++ b/scripts/gen_config.py
@@ -62,7 +62,7 @@ def load_yaml(fname: str, profile: dict, include = True):

4
patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch
View File

@@ -1,7 +1,7 @@
From c6beeb8b4854b12b72a3ff2ed141129023f08eaf Mon Sep 17 00:00:00 2001
From dfc5ca4495315d293ccdb1c52d7d29a133ba596b Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 22 Jun 2020 14:32:45 +0200
Subject: [PATCH 09/21] base-files: make sysupgrade work on qcom AX
Subject: [PATCH 09/43] base-files: make sysupgrade work on qcom AX
The qsdk v4.4 ubi layer does not detach the rootfs properly during
sysupgrade. Pull in the ubu force detach patch from owrt-15.05.

4
patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch
View File

@@ -1,7 +1,7 @@
From 0d04a28c9646e245021282bc38740ae2ced17a08 Mon Sep 17 00:00:00 2001
From db79fb81502c935be1295c258fb4738dfb2351bd Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 23 Sep 2020 17:34:44 +0200
Subject: [PATCH 10/21] base-files: add support for v4.4 style netdev led
Subject: [PATCH 10/43] base-files: add support for v4.4 style netdev led
triggers
Current owrt scripting cant handle the old v4.4 style sysfs API of led

6
patches/0011-busybox-enable-the-watchdog-tool.patch
View File

@@ -1,7 +1,7 @@
From c3e8689eba6ceafc23973883131349ef89c714ed Mon Sep 17 00:00:00 2001
From 5c54120d8b707a1022052edd562cea1a358a9bce Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 28 Jul 2020 09:21:04 +0200
Subject: [PATCH 11/21] busybox: enable the watchdog tool
Subject: [PATCH 11/43] busybox: enable the watchdog tool
procd can currently only handle the main wdt. Enable the busybox
applet until procd can handle multiple devices.
@@ -12,7 +12,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 04148df267..2389bbb8e0 100644
index 168c73b24c..d35ce0b7b8 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -2182,7 +2182,7 @@ config BUSYBOX_DEFAULT_VOLNAME

8
patches/0012-dnsmasq-add-relay-option82-support.patch
View File

@@ -1,7 +1,7 @@
From 8ca8d0669ea2b36a5542d9bcda32cddf9cd7cd0f Mon Sep 17 00:00:00 2001
From 42e7cc0388b258ae0f391e7b0dbab9b53b067124 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 8 Jun 2021 09:12:38 +0200
Subject: [PATCH] dnsmasq: add relay / option82 support
Subject: [PATCH 12/43] dnsmasq: add relay / option82 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100644 package/network/services/dnsmasq/patches/200-option82.patch
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 680e72f9e7..51f405b73c 100644
index 205bfb4cf6..dacd476cd4 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -761,12 +761,14 @@ dhcp_relay_add() {
@@ -777,12 +777,14 @@ dhcp_relay_add() {
[ -n "$server_addr" ] || return 0
config_get interface "$cfg" interface

4
patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch
View File

@@ -1,7 +1,7 @@
From 4fb2a69f3bbdab006a6b751ce39203cfdade9ae6 Mon Sep 17 00:00:00 2001
From 9fb93fbd42f8f1f3036580b6666b40ab343509f8 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 17 Jun 2021 08:47:51 +0200
Subject: [PATCH] base-files: ignore sysupgrade that was not ours
Subject: [PATCH 13/43] base-files: ignore sysupgrade that was not ours
Signed-off-by: John Crispin <john@phrozen.org>
---

6
patches/0014-ipq806x-simplify-ecw5410-dts.patch
View File

@@ -1,7 +1,7 @@
From b820ffd87781ef60bd6b5ef64162adf9cbb7d72b Mon Sep 17 00:00:00 2001
From 8b82aea440583198be21bbbe4e3f6d7bd814aad8 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 17 Jun 2021 16:13:40 +0200
Subject: [PATCH 2/4] ipq806x: simplify ecw5410 dts
Subject: [PATCH 14/43] ipq806x: simplify ecw5410 dts
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -37,7 +37,7 @@ index 3befc40630..e5715a79aa 100644
linksys,ea8500)
caldata_extract "art" 0x5000 0x2f20
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
index 712910c261..e6fc3453b0 100644
index 712910c261..e87ef16b9a 100644
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
@@ -95,6 +95,16 @@

4
patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch
View File

@@ -1,7 +1,7 @@
From c0442b28c993b63a5af510448e01083f3d681475 Mon Sep 17 00:00:00 2001
From 2a1e093c78738b3c3e47bbf357efe571ff04d8aa Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 15 Feb 2021 15:20:44 +0100
Subject: [PATCH 15/21] ipq807x: buildsystem patches required by the target
Subject: [PATCH 15/43] ipq807x: buildsystem patches required by the target
The target uses the v4.4 kernel and requires these patches to build
properly.

32
patches/0016-linux-modules-fix-some-v4.4-dependencies.patch
View File

@@ -1,7 +1,7 @@
From 6942520b7623e3fc793a229e04af2b74fd19f556 Mon Sep 17 00:00:00 2001
From 5cb922f8d91e2bdd48807adf26336e61b03747a6 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 24 Mar 2021 15:03:30 +0100
Subject: [PATCH 16/21] linux/modules: fix some v4.4 dependencies
Subject: [PATCH 16/43] linux/modules: fix some v4.4 dependencies
NFT has different deps on v4.4.
@@ -27,13 +27,13 @@ Signed-off-by: John Crispin <john@phrozen.org>
toolchain/gcc/Config.in | 5 +++
toolchain/gcc/Config.version | 1 +
toolchain/kernel-headers/Makefile | 2 +-
21 files changed, 145 insertions(+), 40 deletions(-)
20 files changed, 143 insertions(+), 40 deletions(-)
diff --git a/config/Config-images.in b/config/Config-images.in
index 2921cd5bca..969b57efee 100644
index b869ccae70..de11c52676 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -17,6 +17,7 @@ menu "Target Images"
@@ -18,6 +18,7 @@ menu "Target Images"
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
@@ -42,7 +42,7 @@ index 2921cd5bca..969b57efee 100644
depends on TARGET_ROOTFS_INITRAMFS
help
diff --git a/include/image.mk b/include/image.mk
index 2530108211..10e7063f41 100644
index 7c2dcf0e8b..6fc02a3f6b 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -153,6 +153,7 @@ endif
@@ -62,7 +62,7 @@ index 2530108211..10e7063f41 100644
define Image/pad-to
dd if=$(1) of=$(1).new bs=$(2) conv=sync
diff --git a/include/kernel.mk b/include/kernel.mk
index d2a5b42138..4e9561c93c 100644
index e4074a48f4..56fa06b2eb 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -44,7 +44,7 @@ else
@@ -261,7 +261,7 @@ index 7526224972..691f8fb186 100644
__config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk
index 58c257db5b..3bf0359c11 100644
index 3060fc0966..5542c4fe0a 100644
--- a/package/kernel/linux/modules/can.mk
+++ b/package/kernel/linux/modules/can.mk
@@ -248,7 +248,8 @@ define KernelPackage/can-usb-kvaser
@@ -275,10 +275,10 @@ index 58c257db5b..3bf0359c11 100644
$(call AddDepends/can,+kmod-usb-core)
endef
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index e9e78e7967..e7776c096c 100644
index b50ed06824..a68459d989 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -377,7 +377,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
@@ -387,7 +387,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
define KernelPackage/crypto-hw-safexcel
TITLE:= MVEBU SafeXcel Crypto Engine module
@@ -287,7 +287,7 @@ index e9e78e7967..e7776c096c 100644
+kmod-crypto-authenc +kmod-crypto-md5 +kmod-crypto-hmac +kmod-crypto-sha256 +kmod-crypto-sha512
KCONFIG:= \
CONFIG_CRYPTO_HW=y \
@@ -549,8 +549,10 @@ ifndef CONFIG_TARGET_x86_64
@@ -710,8 +710,10 @@ ifndef CONFIG_TARGET_x86_64
$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \
$(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
$(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \
@@ -299,7 +299,7 @@ index e9e78e7967..e7776c096c 100644
AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \
serpent-sse2-i586 twofish-i586 blowfish_generic)
endef
@@ -569,7 +571,8 @@ define KernelPackage/crypto-misc/x86/64
@@ -730,7 +732,8 @@ define KernelPackage/crypto-misc/x86/64
$(LINUX_DIR)/arch/x86/crypto/twofish-avx-x86_64.ko \
$(LINUX_DIR)/arch/x86/crypto/serpent-avx-x86_64.ko \
$(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx2.ko \
@@ -413,7 +413,7 @@ index e2bb1d0681..1be05e182a 100644
endef
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 2c2fe82fa0..36e1732c11 100644
index 1eec9f9b63..4343e850e9 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -375,7 +375,7 @@ $(eval $(call KernelPackage,ip6-vti))
@@ -425,7 +425,7 @@ index 2c2fe82fa0..36e1732c11 100644
KCONFIG:=CONFIG_XFRM_INTERFACE
FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
AUTOLOAD:=$(call AutoProbe,xfrm_interface)
@@ -764,7 +764,7 @@ $(eval $(call KernelPackage,sched-core))
@@ -765,7 +765,7 @@ $(eval $(call KernelPackage,sched-core))
define KernelPackage/sched-cake
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Cake fq_codel/blue derived shaper
@@ -434,7 +434,7 @@ index 2c2fe82fa0..36e1732c11 100644
KCONFIG:=CONFIG_NET_SCH_CAKE
FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko
AUTOLOAD:=$(call AutoProbe,sch_cake)
@@ -1147,7 +1147,7 @@ $(eval $(call KernelPackage,rxrpc))
@@ -1154,7 +1154,7 @@ $(eval $(call KernelPackage,rxrpc))
define KernelPackage/mpls
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=MPLS support
@@ -508,7 +508,7 @@ index 83d998c83a..784adcb744 100644
FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
AUTOLOAD:=$(call AutoLoad,10,tpm,1)
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 3dd20a0696..e3acb4bf79 100644
index 592affe494..41d12cb08a 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -458,9 +458,28 @@ endef

10
patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
View File

@@ -1,7 +1,7 @@
From 67774c73ab28997107e29487a95d9c96e11398f7 Mon Sep 17 00:00:00 2001
From 6ec4c8f7d24c34c5855278fe13bde4e5e43ba293 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 18 Jul 2020 08:53:44 +0200
Subject: [PATCH 01/22] ipq807x: add the Qualcomm AX target support
Subject: [PATCH 17/43] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -119,7 +119,7 @@ index f71114b5da..4a85d83118 100644
string "Custom Kernel Build User Name"
default "builder" if BUILDBOT
diff --git a/include/image.mk b/include/image.mk
index 5ee6d309e4..7a48b789af 100644
index 6fc02a3f6b..92b23321b1 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -179,6 +179,10 @@ define Image/pad-root-squashfs
@@ -186,10 +186,10 @@ index 0000000000..6c429f1852
+
+exit 0
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index c4d9dd78e3..6670d310db 100644
index b12c9af9a7..b7ee73b12e 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -254,6 +254,11 @@ case "$FIRMWARE" in
@@ -265,6 +265,11 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;;

20
patches/0018-ramips-add-tplink-ex228-support.patch
View File

@@ -1,7 +1,7 @@
From 842b431559c3992e182190b7f96c4407978723c7 Mon Sep 17 00:00:00 2001
From 2970ecaae31c8e42cf1ef5cff2a78cf57701070e Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 27 May 2021 16:48:27 +0200
Subject: [PATCH] ramips: add tplink ex228 support
Subject: [PATCH 18/43] ramips: add tplink ex228 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -148,10 +148,10 @@ index 0000000000..9e5cc9ef01
+ };
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index a8f558326d..1a84abc842 100644
index a3bc14d59d..6e0b9b5f76 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1138,6 +1138,16 @@ define Device/tplink_eap235-wall-v1
@@ -1271,6 +1271,16 @@ define Device/tplink_eap235-wall-v1
endef
TARGET_DEVICES += tplink_eap235-wall-v1
@@ -169,11 +169,11 @@ index a8f558326d..1a84abc842 100644
$(Device/dsa-migration)
$(Device/tplink-safeloader)
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 89e679be7c..b6b8b6482d 100755
index 4b44669b84..1c4e29dd97 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -36,6 +36,7 @@ ramips_setup_interfaces()
;;
@@ -25,6 +25,7 @@ ramips_setup_interfaces()
ampedwireless,ally-r1900k|\
gehua,ghl-r-001|\
hiwifi,hc5962|\
+ tplink,ex228|\
@@ -181,13 +181,13 @@ index 89e679be7c..b6b8b6482d 100755
xiaomi,mi-router-ac2100|\
xiaomi,redmi-router-ac2100)
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index c9152c5cf4..853a464ea5 100755
index c2ad4d3ed6..acaa62d171 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -61,6 +61,7 @@ platform_do_upgrade() {
netgear,wac104|\
@@ -73,6 +73,7 @@ platform_do_upgrade() {
netgear,wac124|\
netis,wf2881|\
sercomm,na502|\
+ tplink,ex228|\
xiaomi,mi-router-3g|\
xiaomi,mi-router-3-pro|\

4
patches/0019-lldp-add-TIP-tweaks.patch
View File

@@ -1,7 +1,7 @@
From 7a4571cc0c12d54d0aca93dfedbe8dc33cff39fa Mon Sep 17 00:00:00 2001
From 58242d355b483e105affd0c69c681e46e88ad84c Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 4 Dec 2020 16:29:35 +0100
Subject: [PATCH 01/11] lldp: add TIP tweaks
Subject: [PATCH 19/43] lldp: add TIP tweaks
Signed-off-by: John Crispin <john@phrozen.org>
---

6
patches/0020-ramips-make-wifi-work.patch
View File

@@ -1,7 +1,7 @@
From 949cec1e6873109d29ee435d9f2370fbbb7b9700 Mon Sep 17 00:00:00 2001
From e00ffc2ad678216a318106da687701aafa5a1ac7 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 4 Dec 2020 16:29:16 +0100
Subject: [PATCH 20/21] ramips: make wifi work
Subject: [PATCH 20/43] ramips: make wifi work
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
1 file changed, 1 insertion(+)
diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4
index ec21b3722b..725aa9b070 100644
index dfd01598ad..e82b775758 100644
--- a/target/linux/ramips/mt76x8/config-5.4
+++ b/target/linux/ramips/mt76x8/config-5.4
@@ -46,6 +46,7 @@ CONFIG_CPU_R4K_CACHE_TLB=y

14
patches/0021-ugps-update-to-latest-HEAD.patch
View File

@@ -1,7 +1,7 @@
From efdbdcd3503315022a3270886826656be116345b Mon Sep 17 00:00:00 2001
From 6e5fd4e18759885bd25aa182d5cc7ce1c7f8eeea Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 19 Jun 2021 16:00:43 +0200
Subject: [PATCH 38/38] ugps: update to latest HEAD
Subject: [PATCH 21/43] ugps: update to latest HEAD
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -9,16 +9,16 @@ Signed-off-by: John Crispin <john@phrozen.org>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
index 4ce64d9631..e9a7f4fa8f 100644
index c70a7b7ea6..389138d1dd 100644
--- a/package/utils/ugps/Makefile
+++ b/package/utils/ugps/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-08-29
-PKG_SOURCE_VERSION:=511a5b3c84fa715ef0305cf26c98619c12a4867a
-PKG_MIRROR_HASH:=551d57b4c18da4c4695fa2f7a959c25a03be35d14cf872785e7db740f12366e2
-PKG_SOURCE_DATE:=2021-06-08
-PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
-PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
+PKG_SOURCE_DATE:=2021-07-19
+PKG_SOURCE_VERSION:=350b960b6f8b08409dcef719ef1e1e0c8911040f
+PKG_MIRROR_HASH:=94d489072f8fccc26f624c3d3c65e7cb40e4b6267df5fb39d4e0e78469006bde

4
patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch
View File

@@ -1,7 +1,7 @@
From 91d0510ff553a1dd43312eee44ef6290a9eb751c Mon Sep 17 00:00:00 2001
From 687576be91062e5ab25e8ff4e2d990799a34210f Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 8 Apr 2021 10:46:29 +0200
Subject: [PATCH] Revert "ipq40xx: revert usage of VLAN S-TAG"
Subject: [PATCH 22/43] Revert "ipq40xx: revert usage of VLAN S-TAG"
This reverts commit cdc8d4b46f0811292fffc6094acd81e854b5f4a5.

4
patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch
View File

@@ -1,7 +1,7 @@
From 558605338e87ebac7358026eb86b7ba5f4c228a1 Mon Sep 17 00:00:00 2001
From f6f9f9f095bdd05c66f23357228b90a8daeedd14 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 25 Mar 2021 08:03:48 +0100
Subject: [PATCH 23/23] ipq40xx: add ath10k-ct fw.cfg stubs
Subject: [PATCH 23/43] ipq40xx: add ath10k-ct fw.cfg stubs
Signed-off-by: John Crispin <john@phrozen.org>
---

25
patches/0024-ipq40xx-fix-ecw5211-support.patch
View File

@@ -1,25 +0,0 @@
From c82870ef8a2ae4798ede9393254c1e18798e5d01 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 15 Jun 2021 17:03:14 +0200
Subject: [PATCH] ipq40xx: fix ecw5211 support
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/ipq40xx/image/generic.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 1de17dd15a..487bba77b0 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -371,6 +371,7 @@ define Device/edgecore_ecw5211
SOC := qcom-ipq4018
BLOCKSIZE := 128k
PAGESIZE := 2048
+ DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
endef
TARGET_DEVICES += edgecore_ecw5211
--
2.25.1

16
patches/0025-target-add-pstore-support.patch → patches/0024-target-add-pstore-support.patch
View File

@@ -1,23 +1,21 @@
From e0ff8f29f0c0c147b34fe943698e8f95dfa6c688 Mon Sep 17 00:00:00 2001
From 17dbf01adfa8cc4704873a57ae3676fe09f961fa Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 30 Mar 2021 19:03:43 +0200
Subject: [PATCH 1/6] target: add pstore support
Subject: [PATCH 24/43] target: add pstore support
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/generic/config-5.10 | 15 ++++++++++++++-
target/linux/generic/config-5.4 | 14 +++++++++++++-
.../linux/ipq40xx/patches-5.4/903-pstore.patch | 17 +++++++++++++++++
.../patches-5.10/160-add-pstore-support.patch | 17 +++++++++++++++++
4 files changed, 61 insertions(+), 2 deletions(-)
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 target/linux/ipq40xx/patches-5.4/903-pstore.patch
create mode 100644 target/linux/mediatek/patches-5.10/160-add-pstore-support.patch
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index ba6317e35f..3e911a2619 100644
index 4eb5607f17..2582e8851a 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -4424,7 +4424,20 @@ CONFIG_PROC_SYSCTL=y
@@ -4506,7 +4506,20 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_PSAMPLE is not set
# CONFIG_PSB6970_PHY is not set
# CONFIG_PSI is not set
@@ -40,10 +38,10 @@ index ba6317e35f..3e911a2619 100644
# CONFIG_PTP_1588_CLOCK is not set
# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index a0193ca718..da2cc8db65 100644
index da0e2e2186..b6673ede4d 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -4136,7 +4136,19 @@ CONFIG_PROC_SYSCTL=y
@@ -4177,7 +4177,19 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_PSAMPLE is not set
# CONFIG_PSB6970_PHY is not set
# CONFIG_PSI is not set

12
patches/0026-ath79-add-support-for-Indio-305AC.patch → patches/0025-ath79-add-Support-for-Indio-305AC.patch
View File

@@ -1,7 +1,7 @@
From 008a385635cafdce3498ebd6a6b429a1aa2e03bd Mon Sep 17 00:00:00 2001
From da01b2ec475761de8ac92045329483f8a9cf7438 Mon Sep 17 00:00:00 2001
From: Rohan Nathi <rohan.nathi@indionetworks.com>
Date: Thu, 24 Jun 2021 13:48:45 +0000
Subject: [PATCH] ath79: add Support for Indio 305AC
Subject: [PATCH 25/43] ath79: add Support for Indio 305AC
Signed-off-by: Rohan Nathi <rohan.nathi@indionetworks.com>
---
@@ -134,10 +134,10 @@ index 0000000000..763fdcefa8
+ mtd-cal-data = <&art 0x1000>;
+};
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 5a44dd94e5..94afc9c726 100644
index 783895525b..80f755b343 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -43,6 +43,7 @@ case "$FIRMWARE" in
@@ -44,6 +44,7 @@ case "$FIRMWARE" in
ubnt,powerbeam-5ac-500|\
ubnt,powerbeam-5ac-gen2|\
ubnt,unifiac-pro|\
@@ -146,10 +146,10 @@ index 5a44dd94e5..94afc9c726 100644
caldata_extract "art" 0x5000 0x844
;;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index d93ebbaeba..da95360281 100644
index ce4e462a40..24778e8f1c 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -2191,6 +2191,17 @@ define Device/yuncore_a770
@@ -2209,6 +2209,17 @@ define Device/yuncore_a770
endef
TARGET_DEVICES += yuncore_a770

8
patches/0027-ath79-tl-wpa8630p-fixes.patch → patches/0026-ath79-tl-wpa8630p-fixes.patch
View File

@@ -1,7 +1,7 @@
From a14a7d3580ba376227eba8c28d7e632f0f4e1ffc Mon Sep 17 00:00:00 2001
From 643d734b0d05bc9e5fe1b4588bf0876c9fd87bd4 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 30 Jun 2021 11:36:13 +0200
Subject: [PATCH 35/36] ath79: tl-wpa8630p fixes
Subject: [PATCH 26/43] ath79: tl-wpa8630p fixes
* a certificates partition and change default port mapping
@@ -30,10 +30,10 @@ index 9e6d23de4e..c39dbc515b 100644
};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index b8bc38348e..f300077dba 100755
index 31c0f11861..3ba3d72abc 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -380,7 +380,7 @@ ath79_setup_interfaces()
@@ -385,7 +385,7 @@ ath79_setup_interfaces()
tplink,tl-wpa8630p-v2.1-eu)
# port 5 (internal) is the power-line port
ucidef_add_switch "switch0" \

18
patches/0028-ath79-add-support-for-TP-Link-CPE710-v1.patch → patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch
View File

@@ -1,7 +1,7 @@
From 84b1c4894ff871686c4bd7152aca47a323857db6 Mon Sep 17 00:00:00 2001
From 6ecffc2057aa1261846e51a3966b8710f605910a Mon Sep 17 00:00:00 2001
From: Andrew Cameron <apcameron@softhome.net>
Date: Mon, 12 Apr 2021 13:24:33 -0500
Subject: [PATCH] ath79: add support for TP-Link CPE710-v1
Subject: [PATCH 27/43] ath79: add support for TP-Link CPE710-v1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -186,7 +186,7 @@ index 0000000000..830c3d30b8
+ };
+};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index fae5ac7c92..5c7e39e48f 100755
index 7c5eeb1112..05bdf60f78 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -164,7 +164,8 @@ enterasys,ws-ap3705i|\
@@ -200,7 +200,7 @@ index fae5ac7c92..5c7e39e48f 100755
;;
compex,wpj344-16m|\
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index f300077dba..4fe605dee7 100755
index 3ba3d72abc..d70432ad2b 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -63,6 +63,7 @@ ath79_setup_interfaces()
@@ -212,10 +212,10 @@ index f300077dba..4fe605dee7 100755
tplink,eap225-v3|\
tplink,eap245-v1|\
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 94afc9c726..fc110af75c 100644
index 80f755b343..4d7940d6ba 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -228,6 +228,12 @@ case "$FIRMWARE" in
@@ -229,6 +229,12 @@ case "$FIRMWARE" in
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
@@ -229,7 +229,7 @@ index 94afc9c726..fc110af75c 100644
tplink,eap225-v3|\
tplink,eap225-wall-v2|\
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 0058d74f77..e8c081eab1 100644
index be6aa06b55..78340f650e 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -362,6 +362,17 @@ define Device/tplink_cpe610-v2
@@ -251,10 +251,10 @@ index 0058d74f77..e8c081eab1 100644
$(Device/tplink-safeloader)
LOADER_TYPE := elf
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 2bc4a3cb82..2bba417dfc 100644
index 70e21f99cb..c519a6d367 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -537,6 +537,43 @@ static struct device_info boards[] = {
@@ -530,6 +530,43 @@ static struct device_info boards[] = {
.first_sysupgrade_partition = "os-image",
.last_sysupgrade_partition = "support-list",
},

36
patches/0029-ipq4019-add-CIG-wf610d.patch → patches/0028-ipq4019-add-CIG-wf610d.patch
View File

@@ -1,7 +1,7 @@
From 859bdaad5959f972babb268eff24901b116703c8 Mon Sep 17 00:00:00 2001
From 7244d33107173856db10bb2084146137704e7e18 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 13 Apr 2021 16:59:32 +0200
Subject: [PATCH] ipq4019: add CIG wf610d
Date: Sat, 4 Sep 2021 05:56:53 +0200
Subject: [PATCH 28/43] ipq4019: add CIG wf610d
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -19,10 +19,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index e5f10a1f98..513ad4ea67 100644
index e3b25bb556..b996ee311f 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -47,7 +47,8 @@ ALLWIFIBOARDS:= \
@@ -49,7 +49,8 @@ ALLWIFIBOARDS:= \
nec_wg2600hp3 \
plasmacloud_pa1200 \
plasmacloud_pa2200 \
@@ -32,7 +32,7 @@ index e5f10a1f98..513ad4ea67 100644
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -131,5 +132,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
$(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
@@ -100,7 +100,7 @@ literal 0
HcmV?d00001
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index 3e0f3ab258..f9674126ba 100755
index ac11655904..c1d4e693f2 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -30,6 +30,7 @@ edgecore,oap100)
@@ -111,7 +111,7 @@ index 3e0f3ab258..f9674126ba 100755
engenius,eap1300)
ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
@@ -61,6 +62,8 @@ qxwlan,e2600ac-c2)
@@ -69,6 +70,8 @@ qxwlan,e2600ac-c2)
ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
;;
@@ -121,10 +121,10 @@ index 3e0f3ab258..f9674126ba 100755
zyxel,wre6606)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 8b7364ff33..dcdb790c84 100755
index 1d4c78833a..d62a2e5061 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -41,6 +41,7 @@ ipq40xx_setup_interfaces()
@@ -42,6 +42,7 @@ ipq40xx_setup_interfaces()
;;
asus,map-ac2200|\
cilab,meshpoint-one|\
@@ -133,7 +133,7 @@ index 8b7364ff33..dcdb790c84 100755
edgecore,oap100|\
openmesh,a42|\
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 6670d310db..5eae9c6e80 100644
index b7ee73b12e..3948c08984 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -93,6 +93,10 @@ case "$FIRMWARE" in
@@ -147,7 +147,7 @@ index 6670d310db..5eae9c6e80 100644
cellc,rtl30vw |\
compex,wpj419 |\
compex,wpj428 |\
@@ -197,6 +201,10 @@ case "$FIRMWARE" in
@@ -202,6 +206,10 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c)
;;
@@ -589,10 +589,10 @@ index 0000000000..e75e35e8ef
+
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 4e40b8be50..1de17dd15a 100644
index a435a127fa..31f4971c90 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -273,6 +273,20 @@ define Device/cilab_meshpoint-one
@@ -271,6 +271,20 @@ define Device/cilab_meshpoint-one
endef
TARGET_DEVICES += cilab_meshpoint-one
@@ -614,19 +614,19 @@ index 4e40b8be50..1de17dd15a 100644
$(call Device/FitImage)
$(call Device/UbiFit)
diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index a3d3341587..aec0d01ed6 100644
index 6b7c68bf63..aa2fc4bd17 100644
--- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,58 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
@@ -43,6 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
@@ -45,6 +45,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
qcom-ipq4019-ap.dk07.1-c1.dtb \
qcom-ipq4019-ap.dk07.1-c2.dtb \
+ qcom-ipq4019-a62.dtb \

4
patches/0030-base-files-add-a-turnoff-command-to-the-led-script.patch → patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch
View File

@@ -1,7 +1,7 @@
From 5da505e5f59e93a8a6e928ad6c09a076f9889af1 Mon Sep 17 00:00:00 2001
From bc2e9052af84664a2caae0581aa745d09240b160 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 19 Apr 2021 13:49:20 +0200
Subject: [PATCH 01/10] base-files: add a turnoff command to the led script
Subject: [PATCH 29/43] base-files: add a turnoff command to the led script
Signed-off-by: John Crispin <john@phrozen.org>
---

30
patches/0030-ath10k-ct-update-the-driver.patch Normal file
View File

@@ -0,0 +1,30 @@
From ed5a8958378d84bba92a70f2a56a962be73c4b3b Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 23 Apr 2021 16:16:31 +0200
Subject: [PATCH 30/43] ath10k-ct: update the driver
Signed-off-by: John Crispin <john@phrozen.org>
---
package/kernel/ath10k-ct/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index 5681c5c2cd..24e0702e2c 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-06-03
-PKG_SOURCE_VERSION:=b44cd7b2e7b0df5995ece18f358d4dfc40834ba1
-PKG_MIRROR_HASH:=59f961ad425eb1a48fa9c391a325cc0f23845daec9d12673445d3077f9756cf0
+PKG_SOURCE_DATE:=2021-04-23
+PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
+PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
# Build the 5.10 ath10k-ct driver version.
# Probably this should match as closely as
--
2.25.1

75
patches/0031-ath10k-ct-update-the-driver.patch
View File

@@ -1,75 +0,0 @@
From 644f52a193d0430e41d6c28c221e801a0e87affa Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 23 Apr 2021 16:16:31 +0200
Subject: [PATCH] ath10k-ct: update the driver
Signed-off-by: John Crispin <john@phrozen.org>
---
package/kernel/ath10k-ct/Makefile | 6 +--
...64-ath10k-commit-rates-from-mac80211.patch | 37 -------------------
2 files changed, 3 insertions(+), 40 deletions(-)
delete mode 100644 package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index a225bd8b19..8c2c36062d 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-01-11
-PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b
-PKG_MIRROR_HASH:=4e30e256716611045e930b95eadaa8bfcadd5bdd8bbe3869cfe0f377920e812b
+PKG_SOURCE_DATE:=2021-04-23
+PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
+PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
# Build the 5.10 ath10k-ct driver version.
# Probably this should match as closely as
diff --git a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
deleted file mode 100644
index 842f3ea2a5..0000000000
--- a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 26 Feb 2019 08:06:35 +0100
-Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
-
-The rates from mac80211 have to be copied to the state of ath10k-ct or
-otherwise the ath10k_check_apply_special_rates function overwrites
-them again with some default values. This breaks for example the
-mcast_rate set for a wifi-iface.
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
---- a/ath10k-5.10/mac.c
-+++ b/ath10k-5.10/mac.c
-@@ -6774,6 +6774,7 @@ static void ath10k_recalculate_mgmt_rate
- return;
- }
-
-+ arvif->mgt_rate[def->chan->band] = hw_rate_code;
- vdev_param = ar->wmi.vdev_param->mgmt_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
- hw_rate_code);
-@@ -7000,6 +7001,7 @@ static void ath10k_bss_info_changed(stru
- "mac vdev %d mcast_rate %x\n",
- arvif->vdev_id, rate);
-
-+ arvif->mcast_rate[band] = rate;
- vdev_param = ar->wmi.vdev_param->mcast_data_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- vdev_param, rate);
-@@ -7008,6 +7010,7 @@ static void ath10k_bss_info_changed(stru
- "failed to set mcast rate on vdev %i: %d\n",
- arvif->vdev_id, ret);
-
-+ arvif->bcast_rate[band] = rate;
- vdev_param = ar->wmi.vdev_param->bcast_data_rate;
- ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- vdev_param, rate);
--
2.25.1

30
patches/0032-ipq40xx-add-tplink-ec420-support.patch → patches/0031-ipq40xx-add-tplink-ec420-support.patch
View File

@@ -1,7 +1,7 @@
From fa71a84201e148d5eb9c36cb7acb9d9d2fa8fca9 Mon Sep 17 00:00:00 2001
From 0f91fe9eea8820e68b3d754e768a673ed165b3ce Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 18 Jun 2021 11:07:02 +0200
Subject: [PATCH 1/7] ipq40xx: add tplink ec420 support
Date: Sat, 4 Sep 2021 05:59:39 +0200
Subject: [PATCH 31/43] ipq40xx: add tplink ec420 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -34,10 +34,10 @@ index b24cbf979e..44a8688dbe 100644
ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
;;
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 513ad4ea67..87dcf9a769 100644
index b996ee311f..c9d113ae6a 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -48,7 +48,8 @@ ALLWIFIBOARDS:= \
@@ -50,7 +50,8 @@ ALLWIFIBOARDS:= \
plasmacloud_pa1200 \
plasmacloud_pa2200 \
qxwlan_e2600ac \
@@ -47,7 +47,7 @@ index 513ad4ea67..87dcf9a769 100644
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -133,5 +134,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
@@ -137,5 +138,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
@@ -1095,11 +1095,11 @@ literal 0
HcmV?d00001
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 597fa9f08b..238376afca 100755
index d62a2e5061..16f6040b6e 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -31,8 +31,9 @@ ipq40xx_setup_interfaces()
meraki,mr33|\
@@ -32,8 +32,9 @@ ipq40xx_setup_interfaces()
mikrotik,sxtsq-5-ac|\
netgear,ex6100v2|\
netgear,ex6150v2|\
+ tp-link,ec420-g1|\
@@ -1110,7 +1110,7 @@ index 597fa9f08b..238376afca 100755
aruba,ap-303h)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 5eae9c6e80..8d3006381d 100644
index 3948c08984..c8943d3ba3 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -46,6 +46,9 @@ case "$FIRMWARE" in
@@ -1123,7 +1123,7 @@ index 5eae9c6e80..8d3006381d 100644
esac
;;
"ath10k/pre-cal-ahb-a000000.wifi.bin")
@@ -154,6 +157,9 @@ case "$FIRMWARE" in
@@ -159,6 +162,9 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x1000 0x2f20
ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
;;
@@ -1133,7 +1133,7 @@ index 5eae9c6e80..8d3006381d 100644
esac
;;
"ath10k/pre-cal-ahb-a800000.wifi.bin")
@@ -262,11 +268,6 @@ case "$FIRMWARE" in
@@ -273,11 +279,6 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;;
@@ -1146,7 +1146,7 @@ index 5eae9c6e80..8d3006381d 100644
;;
*)
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 5582696759..530545e442 100644
index 54683977cd..cbdd12c750 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -72,7 +72,8 @@ platform_do_upgrade() {
@@ -1441,10 +1441,10 @@ index 0000000000..9f6fdd5e76
+};
+
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 487bba77b0..860b5e03bf 100644
index 31f4971c90..ec3e779a44 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -820,3 +820,18 @@ define Device/zyxel_wre6606
@@ -816,3 +816,18 @@ define Device/zyxel_wre6606
DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
endef
TARGET_DEVICES += zyxel_wre6606

73
patches/0033-ipq806x-update-to-latest-HEAD.patch → patches/0032-ipq806x-update-to-latest-HEAD.patch
View File

@@ -1,16 +1,15 @@
From f50e63e5eb4a8b3a15985183c337301f87e5b6ed Mon Sep 17 00:00:00 2001
From a16429d604a6c2cff7b2791e380fc57827485f03 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 18 Aug 2021 12:13:29 +0200
Subject: [PATCH] ipq806x: update to latest HEAD
Date: Sat, 4 Sep 2021 06:01:17 +0200
Subject: [PATCH 32/43] ipq806x: update to latest HEAD
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/ipq806x/Makefile | 1 +
.../ipq806x/base-files/etc/board.d/01_leds | 1 -
.../ipq806x/base-files/etc/board.d/02_network | 22 +-
.../ipq806x/base-files/etc/board.d/02_network | 17 +-
.../etc/hotplug.d/firmware/11-ath10k-caldata | 58 +-
.../ipq806x/base-files/etc/init.d/bootcount | 7 +-
.../ipq806x/base-files/etc/init.d/cpufreq | 17 +
.../base-files/lib/preinit/04_reorder_eth | 13 +
.../ipq806x/base-files/lib/upgrade/asrock.sh | 4 +-
.../base-files/lib/upgrade/platform.sh | 19 +-
@@ -93,7 +92,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
...-dt-Add-L2-frequency-scaling-support.patch | 199 ----
...056-cpufreq-dt-Add-missing-rcu-locks.patch | 23 -
...conflicts-with-OpenWrt-auto-mounting.patch | 23 -
...sens-support-configurable-interrupts.patch | 2 +-
.../0069-arm-boot-add-dts-files.patch | 3 +-
.../083-ipq8064-dtsi-additions.patch | 84 +-
...qcom-cpufreq-nvmem-support-specific-.patch | 51 +
@@ -106,8 +104,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
...conflicts-with-OpenWrt-auto-mounting.patch | 24 +
.../patches-5.4/851-add-gsbi1-dts.patch | 2 +-
.../linux/ipq806x/patches-5.4/999-at803.patch | 12 -
101 files changed, 9212 insertions(+), 1367 deletions(-)
create mode 100755 target/linux/ipq806x/base-files/etc/init.d/cpufreq
99 files changed, 9190 insertions(+), 1365 deletions(-)
create mode 100644 target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
create mode 100644 target/linux/ipq806x/config-5.10
create mode 100644 target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -194,7 +191,7 @@ index 284f9e2c1d..74b94a29b4 100755
# Copyright (C) 2015 OpenWrt.org
#
diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index ddef4b7ac6..1a1cec51aa 100755
index 1e00b97092..1a1cec51aa 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
@@ -227,23 +224,7 @@ index ddef4b7ac6..1a1cec51aa 100755
;;
linksys,ea7500-v1)
hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
@@ -51,7 +57,6 @@ nec,wg2600hp3)
"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
;;
netgear,r7800 |\
-tplink,ad7200 |\
tplink,c2600)
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
@@ -66,11 +71,18 @@ qcom,ipq8064-db149)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
;;
+tplink,ad7200)
+ ucidef_add_switch "switch0" \
+ "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" "0@eth0"
+ ;;
ubnt,unifi-ac-hd)
@@ -73,7 +79,10 @@ ubnt,unifi-ac-hd)
ucidef_set_interface_lan "eth0 eth1"
;;
zyxel,nbg6817)
@@ -404,29 +385,6 @@ index 7a54c34dba..cb32a4ed35 100755
;;
edgecore,ecw5410)
fw_setenv bootcount 0
diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpufreq b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
new file mode 100755
index 0000000000..19278902ed
--- /dev/null
+++ b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
@@ -0,0 +1,17 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+
+boot() {
+ local governor
+
+ governor=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_governor)
+
+ if [ "$governor" = "ondemand" ]; then
+ # Effective only with ondemand
+ echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+ echo 600000 > /sys/devices/system/cpu/cpufreq/policy1/scaling_min_freq
+ echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
+ echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
+ fi
+}
diff --git a/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth b/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
new file mode 100644
index 0000000000..9f58473617
@@ -6662,7 +6620,7 @@ diff --git a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patc
similarity index 82%
rename from target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
rename to target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
index aa7d2e791e..2d24da01e4 100644
index 7aa46526f2..2d24da01e4 100644
--- a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
+++ b/target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
@@ -1,86 +1,88 @@
@@ -6714,7 +6672,7 @@ index aa7d2e791e..2d24da01e4 100644
--- a/drivers/dma/qcom/Kconfig
+++ b/drivers/dma/qcom/Kconfig
-@@ -28,3 +28,13 @@ config QCOM_HIDMA
-@@ -29,3 +29,13 @@ config QCOM_HIDMA
- (user to kernel, kernel to kernel, etc.). It only supports
- memcpy interface. The core is not intended for general
- purpose slave DMA.
@@ -9874,19 +9832,6 @@ index ff6f6edf49..0000000000
- /*
- * The last SMEM partition may have its size marked as
- * something like 0xffffffff, which means "until the end of the
diff --git a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
index 585bd62a58..54488f25a8 100644
--- a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
+++ b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
@@ -163,7 +163,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
mutex_unlock(&tzd->lock);
return tzd;
-@@ -762,7 +802,10 @@ static const char * const trip_types[] =
+@@ -765,7 +805,10 @@ static const char * const trip_types[] =
[THERMAL_TRIP_ACTIVE] = "active",
[THERMAL_TRIP_PASSIVE] = "passive",
[THERMAL_TRIP_HOT] = "hot",
diff --git a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
index 055a4cbc30..b97d36fd7c 100644
--- a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch

4
patches/0034-feeds.conf.default-drop-luci.patch → patches/0033-feeds.conf.default-drop-luci.patch
View File

@@ -1,7 +1,7 @@
From 1a20d4d44bf4601fef37aaf0e9f12d1bee89a022 Mon Sep 17 00:00:00 2001
From a53506fd073dd451840c3c1974e579a8861f9205 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 4 May 2021 16:48:48 +0200
Subject: [PATCH] feeds.conf.default: drop luci
Subject: [PATCH 33/43] feeds.conf.default: drop luci
we require luci-trunk for the gateway images.

38
patches/0034-ath79-various-fixes.patch Normal file
View File

@@ -0,0 +1,38 @@
From 83b7e4074c238cb64f727cde16cdfcc530aaa329 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 8 May 2021 11:30:32 +0200
Subject: [PATCH 34/43] ath79: various fixes
* free up additional 1MB rootfs space
* make the target use bridge-vlan
* use the single eth port as wan
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/ath79/generic/base-files/etc/board.d/02_network | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index d70432ad2b..b0b152ba74 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -95,7 +95,7 @@ ath79_setup_interfaces()
ubnt,unifi|\
wd,mynet-wifi-rangeextender|\
winchannel,wb2000)
- ucidef_set_interface_lan "eth0"
+ ucidef_set_interface_wan "eth0"
;;
airtight,c-75)
ucidef_add_switch "switch0" \
@@ -675,6 +675,7 @@ ath79_setup_macs()
board_config_update
board=$(board_name)
+ucidef_set_bridge_device bridge
ath79_setup_interfaces $board
ath79_setup_macs $board
board_config_flush
--
2.25.1

88
patches/0035-ath79-various-fixes.patch
View File

@@ -1,88 +0,0 @@
From 167c998efc5ba755bafc1aca1bf68d9e694e4c10 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 8 May 2021 11:30:32 +0200
Subject: [PATCH] ath79: various fixes
* free up additional 1MB rootfs space
* make the target use bridge-vlan
* use the single eth port as wan
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 20 ++++++++-----------
.../generic/base-files/etc/board.d/02_network | 3 ++-
tools/firmware-utils/src/tplink-safeloader.c | 4 ++--
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
index d4b7de440a..c5ab963174 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -59,20 +59,16 @@
partition@40000 {
label = "firmware";
reg = <0x040000 0x780000>;
+ };
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "kernel";
- reg = <0x000000 0x300000>;
- };
+ partition@040000 {
+ label = "kernel";
+ reg = <0x040000 0x210000>;
+ };
- partition@300000 {
- label = "rootfs";
- reg = <0x300000 0x480000>;
- };
+ partition@340000 {
+ label = "rootfs";
+ reg = <0x250000 0x560000>;
};
partition@7c0000 {
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 1e522b91c6..b8bc38348e 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -94,7 +94,7 @@ ath79_setup_interfaces()
ubnt,unifi|\
wd,mynet-wifi-rangeextender|\
winchannel,wb2000)
- ucidef_set_interface_lan "eth0"
+ ucidef_set_interface_wan "eth0"
;;
airtight,c-75)
ucidef_add_switch "switch0" \
@@ -669,6 +669,7 @@ ath79_setup_macs()
board_config_update
board=$(board_name)
+ucidef_set_bridge_device bridge
ath79_setup_interfaces $board
ath79_setup_macs $board
board_config_flush
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index ac71b3305e..2bc4a3cb82 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -443,8 +443,8 @@ static struct device_info boards[] = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x300000},
- {"file-system", 0x340000, 0x470000},
+ {"os-image", 0x40000, 0x210000},
+ {"file-system", 0x250000, 0x560000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
--
2.25.1

37
patches/0036-certificates-add-ability-to-persistently-store-certi.patch → patches/0035-certificates-add-ability-to-persistently-store-certi.patch
View File

@@ -1,16 +1,15 @@
From 6d0385f31cc4f19df8fc51b56bb08af7c9c0922a Mon Sep 17 00:00:00 2001
From ee837f028bd7af515d30a8a90cc2b5ee61eecf19 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sun, 23 May 2021 09:59:53 +0200
Subject: [PATCH 07/11] certificates: add ability to persistently store
Date: Sat, 4 Sep 2021 06:04:54 +0200
Subject: [PATCH 35/43] certificates: add ability to persistently store
certificates
Signed-off-by: John Crispin <john@phrozen.org>
---
target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts | 7 ++++++-
.../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi | 3 +--
.../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 7 ++++++-
.../linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts | 8 ++++++--
4 files changed, 19 insertions(+), 6 deletions(-)
target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts | 7 ++++++-
.../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi | 3 +--
.../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 7 ++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
index 830c3d30b8..71c6381f86 100644
@@ -63,28 +62,6 @@ index b6ce7b1f56..471be72001 100644
};
partition@7c0000 {
diff --git a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
index 303b79ac83..7a228aea86 100644
--- a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
+++ b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
@@ -176,11 +176,15 @@
reg = <0x100000 0x100000>;
read-only;
};
- partition@b260000 {
+ partition@200000 {
label = "firmware";
- reg = <0x200000 0xe00000>;
+ reg = <0x200000 0xdf0000>;
compatible = "openwrt,uimage", "denx,uimage";
};
+ partition@ff0000 {
+ label = "certificates";
+ reg = <0xff0000 0x10000>;
+ };
};
};
};
--
2.25.1

34
patches/0037-ipq4018-add-EdgeCore-SPW2AC1200-support.patch → patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
View File

@@ -1,7 +1,7 @@
From c651355c099a42c12f1953f4d027b32172a45bbb Mon Sep 17 00:00:00 2001
From f7eed3ee6f7bb086a9bc0e049cc411d1bc98ed33 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 1 Jul 2021 16:37:24 +0200
Subject: [PATCH] ipq4018: add EdgeCore SPW2AC1200 support
Date: Sat, 4 Sep 2021 06:15:19 +0200
Subject: [PATCH 36/43] ipq4018: add EdgeCore SPW2AC1200 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts
diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
index b24cbf979e..ac66a7f2bd 100644
index 44a8688dbe..ab489a6e18 100644
--- a/package/boot/uboot-envtools/files/ipq40xx
+++ b/package/boot/uboot-envtools/files/ipq40xx
@@ -34,6 +34,7 @@ case "$board" in
@@ -29,10 +29,10 @@ index b24cbf979e..ac66a7f2bd 100644
glinet,gl-b1300 |\
luma,wrtq-329acn |\
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index f9674126ba..efd5d002db 100755
index c1d4e693f2..d473448137 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -63,6 +63,7 @@ qxwlan,e2600ac-c2)
@@ -71,6 +71,7 @@ qxwlan,e2600ac-c2)
ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
;;
edgecore,ecw5211 |\
@@ -41,10 +41,10 @@ index f9674126ba..efd5d002db 100755
zyxel,nbg6617 |\
zyxel,wre6606)
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 597fa9f08b..7bc8c5e6aa 100755
index 16f6040b6e..0240798bbb 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -43,6 +43,7 @@ ipq40xx_setup_interfaces()
@@ -45,6 +45,7 @@ ipq40xx_setup_interfaces()
cilab,meshpoint-one|\
cig,wf610d|\
edgecore,ecw5211|\
@@ -53,10 +53,10 @@ index 597fa9f08b..7bc8c5e6aa 100755
openmesh,a42|\
openmesh,a62)
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index a9bbc791b8..da7931d018 100644
index c8943d3ba3..ad2946f636 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -101,6 +101,7 @@ case "$FIRMWARE" in
@@ -104,6 +104,7 @@ case "$FIRMWARE" in
compex,wpj419 |\
compex,wpj428 |\
edgecore,ecw5211 |\
@@ -64,7 +64,7 @@ index a9bbc791b8..da7931d018 100644
edgecore,oap100 |\
engenius,eap1300 |\
engenius,eap2200 |\
@@ -212,6 +213,7 @@ case "$FIRMWARE" in
@@ -220,6 +221,7 @@ case "$FIRMWARE" in
compex,wpj419 |\
compex,wpj428 |\
edgecore,ecw5211 |\
@@ -73,7 +73,7 @@ index a9bbc791b8..da7931d018 100644
engenius,eap1300 |\
engenius,eap2200 |\
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 530545e442..f6fc828134 100644
index cbdd12c750..84abd181dc 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -76,7 +76,9 @@ platform_do_upgrade() {
@@ -426,10 +426,10 @@ index 0000000000..a152ba57f4
+ status = "okay";
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index ee648edc50..e4e437bb95 100644
index ec3e779a44..4448ed6083 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -376,6 +376,19 @@ define Device/edgecore_ecw5211
@@ -374,6 +374,19 @@ define Device/edgecore_ecw5211
endef
TARGET_DEVICES += edgecore_ecw5211
@@ -450,15 +450,15 @@ index ee648edc50..e4e437bb95 100644
$(call Device/FitImage)
$(call Device/UbiFit)
diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index aec0d01ed6..492cc67b2c 100644
index aa2fc4bd17..ae0b8f2025 100644
--- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \

141
patches/0037-Revert-libusb-update-to-1.0.24.patch Normal file
View File

@@ -0,0 +1,141 @@
From 0cb58169aa1f1b29c0c713469bdc7b352cdf85f3 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 2 Jul 2021 12:02:04 +0200
Subject: [PATCH 21/27] Revert "libusb: update to 1.0.24"
This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
---
package/libs/libusb/Makefile | 6 +-
...n-the-Changelog-and-clean-up-a-stray.patch | 29 ---------
...parsing-of-descriptors-for-multi-con.patch | 61 -------------------
3 files changed, 3 insertions(+), 93 deletions(-)
delete mode 100644 package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
delete mode 100644 package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
index 6b80b3848d..1667fb2840 100644
--- a/package/libs/libusb/Makefile
+++ b/package/libs/libusb/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libusb
-PKG_VERSION:=1.0.24
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=1.0.22
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=\
https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
@SF/$(PKG_NAME)
-PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
+PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch b/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
deleted file mode 100644
index b17d6178d3..0000000000
--- a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 369af149e3ad92514a2d24f112cedfeb7acaf558 Mon Sep 17 00:00:00 2001
-From: Chris Dickens <christopher.a.dickens@gmail.com>
-Date: Sun, 13 Dec 2020 15:46:27 -0800
-Subject: [PATCH] Correct a typo in the Changelog and clean up a stray file
-
-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
----
- ChangeLog | 2 +-
- libusb/version_nano.h | 2 +-
- test | 0
- 3 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 test
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -12,7 +12,7 @@ visit: http://log.libusb.info
- * Darwin (macOS): use IOUSBDevice as darwin_device_class explicitly (#693)
- * Linux: Drop support for kernel older than 2.6.32
- * Linux: Provide an event thread name (#689)
--* Linux: Wait until all USBs have been reaped before freeing them (#607)
-+* Linux: Wait until all URBs have been reaped before freeing them (#607)
- * NetBSD: Recognize device timeouts (#710)
- * OpenBSD: Allow opening ugen devices multiple times (#763)
- * OpenBSD: Support libusb_get_port_number() (#764)
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 11584
-+#define LIBUSB_NANO 11585
diff --git a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
deleted file mode 100644
index a53a8900de..0000000000
--- a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
-From: Chris Dickens <christopher.a.dickens@gmail.com>
-Date: Sun, 13 Dec 2020 15:49:19 -0800
-Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
- multi-configuration devices
-
-Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
-initialization") introduced a regression for devices with multiple
-configurations. The logic that verifies the reported length of the
-configuration descriptors failed to count the length of the
-configuration descriptor itself and would truncate the actual length by
-9 bytes, leading to a parsing error for subsequent descriptors.
-
-Closes #825
-
-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
----
- libusb/os/linux_usbfs.c | 12 ++++++++----
- libusb/version_nano.h | 2 +-
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
---- a/libusb/os/linux_usbfs.c
-+++ b/libusb/os/linux_usbfs.c
-@@ -641,7 +641,12 @@ static int seek_to_next_config(struct li
- uint8_t *buffer, size_t len)
- {
- struct usbi_descriptor_header *header;
-- int offset = 0;
-+ int offset;
-+
-+ /* Start seeking past the config descriptor */
-+ offset = LIBUSB_DT_CONFIG_SIZE;
-+ buffer += LIBUSB_DT_CONFIG_SIZE;
-+ len -= LIBUSB_DT_CONFIG_SIZE;
-
- while (len > 0) {
- if (len < 2) {
-@@ -718,7 +723,7 @@ static int parse_config_descriptors(stru
- }
-
- if (priv->sysfs_dir) {
-- /*
-+ /*
- * In sysfs wTotalLength is ignored, instead the kernel returns a
- * config descriptor with verified bLength fields, with descriptors
- * with an invalid bLength removed.
-@@ -727,8 +732,7 @@ static int parse_config_descriptors(stru
- int offset;
-
- if (num_configs > 1 && idx < num_configs - 1) {
-- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
-- remaining - LIBUSB_DT_CONFIG_SIZE);
-+ offset = seek_to_next_config(ctx, buffer, remaining);
- if (offset < 0)
- return offset;
- sysfs_config_len = (uint16_t)offset;
---- a/libusb/version_nano.h
-+++ b/libusb/version_nano.h
-@@ -1 +1 @@
--#define LIBUSB_NANO 11585
-+#define LIBUSB_NANO 11586
--
2.25.1

35
patches/0038-Revert-libusb-update-to-1.0.24.patch
View File

@@ -1,35 +0,0 @@
From 4f4e6eec1cab67d6cea9bfa61da5fbbd1a21fdee Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 2 Jul 2021 12:02:04 +0200
Subject: [PATCH] Revert "libusb: update to 1.0.24"
This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
---
package/libs/libusb/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
index e931536339..1667fb2840 100644
--- a/package/libs/libusb/Makefile
+++ b/package/libs/libusb/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libusb
-PKG_VERSION:=1.0.24
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.22
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=\
https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
@SF/$(PKG_NAME)
-PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
+PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1-or-later
--
2.25.1

4
patches/0039-firewall-enable-ssh-on-wan-during-early-boot-stage.patch → patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch
View File

@@ -1,7 +1,7 @@
From 1147a7312c432eebe0de619463fae582051e2e97 Mon Sep 17 00:00:00 2001
From a7bfcdcf6675076c1a8a71aac6e2d8793345e8a6 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 12 Jul 2021 13:10:48 +0200
Subject: [PATCH 37/37] firewall: enable ssh on wan during early boot stage
Subject: [PATCH 38/43] firewall: enable ssh on wan during early boot stage
Signed-off-by: John Crispin <john@phrozen.org>
---

4
patches/0040-netifd-fix-compile-on-older-kernels.patch → patches/0039-netifd-fix-compile-on-older-kernels.patch
View File

@@ -1,7 +1,7 @@
From 5bf7a4a5befe6add789249fe02b737e353137146 Mon Sep 17 00:00:00 2001
From 4b7e51305fcbf27d8c447e165484f513f9ec7185 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 4 Aug 2021 08:36:30 +0200
Subject: [PATCH] netifd: fix compile on older kernels
Subject: [PATCH 39/43] netifd: fix compile on older kernels
The ethtool features do not exist on ancient qualcomm kernels.
Disable that feature if running on QCA.

32
patches/0041-ipq40xx-add-Wallys-DR40x9-support.patch → patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch
View File

@@ -1,7 +1,7 @@
From 5a0366889960ae89594177854b77889cdf22ac63 Mon Sep 17 00:00:00 2001
From 5a9dfd7deb119a2960b062afb9c1a5e7ddc4cf2e Mon Sep 17 00:00:00 2001
From: Robert Marko <robert.marko@sartura.hr>
Date: Fri, 13 Aug 2021 18:28:21 +0200
Subject: [PATCH] ipq40xx: add Wallys DR40x9 support
Date: Sat, 4 Sep 2021 06:19:42 +0200
Subject: [PATCH 40/43] ipq40xx: add Wallys DR40x9 support
Adds support for the Wallys DR40x9 series boards.
They come in IPQ4019 and IPQ4029 versions.
@@ -54,10 +54,10 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq40x9-dr40x9.dts
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 87dcf9a769..192e8dcf7e 100644
index c9d113ae6a..b222ce30d6 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -49,6 +49,7 @@ ALLWIFIBOARDS:= \
@@ -51,6 +51,7 @@ ALLWIFIBOARDS:= \
plasmacloud_pa2200 \
qxwlan_e2600ac \
cig_wf610d \
@@ -65,7 +65,7 @@ index 87dcf9a769..192e8dcf7e 100644
tp-link_ec420-g1
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
$(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
@@ -135,7 +135,7 @@ literal 0
HcmV?d00001
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 9d03b620ce..cfcf518907 100755
index 0240798bbb..5a2a3a47f7 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -19,7 +19,8 @@ ipq40xx_setup_interfaces()
@@ -163,7 +163,7 @@ index c255707f91..e1f75fd4bd 100755
board_config_flush
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 56b9935541..561c8289e7 100644
index ad2946f636..64bb4efaf8 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -115,7 +115,8 @@ case "$FIRMWARE" in
@@ -176,7 +176,7 @@ index 56b9935541..561c8289e7 100644
caldata_extract "0:ART" 0x1000 0x2f20
;;
devolo,magic-2-wifi-next)
@@ -227,7 +228,8 @@ case "$FIRMWARE" in
@@ -232,7 +233,8 @@ case "$FIRMWARE" in
plasmacloud,pa2200 |\
qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2 |\
@@ -187,7 +187,7 @@ index 56b9935541..561c8289e7 100644
;;
devolo,magic-2-wifi-next)
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index f6fc828134..7ebe0396f6 100644
index 84abd181dc..8840372ba9 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -73,6 +73,7 @@ platform_do_upgrade() {
@@ -592,10 +592,10 @@ index 0000000000..cb3296f5e5
+ status = "okay";
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index e4e437bb95..7cbfecb233 100644
index 4448ed6083..540f1f2778 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -834,6 +834,19 @@ define Device/zyxel_wre6606
@@ -830,6 +830,19 @@ define Device/zyxel_wre6606
endef
TARGET_DEVICES += zyxel_wre6606
@@ -616,19 +616,19 @@ index e4e437bb95..7cbfecb233 100644
$(call Device/FitImage)
$(call Device/UbiFit)
diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 492cc67b2c..4d686df304 100644
index ae0b8f2025..826e17b0e9 100644
--- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,63 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
@@ -68,6 +68,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
@@ -70,6 +70,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+ qcom-ipq4029-gl-b1300.dtb \
+ qcom-ipq4029-gl-s1300.dtb \
+ qcom-ipq4029-mr33.dtb \

5
patches/0042-base-files-fix-rootfs_data_max-support-during-sysupg.patch → patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch
View File

@@ -1,7 +1,8 @@
From b673b8dad0cb6392c7097dfe75b2919b13ecd1c6 Mon Sep 17 00:00:00 2001
From 35412c4626e6b2195421452926dd9b2854bceb9a Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 17 Aug 2021 17:29:22 +0200
Subject: [PATCH] base-files: fix rootfs_data_max support during sysupgrade
Subject: [PATCH 41/43] base-files: fix rootfs_data_max support during
sysupgrade
Signed-off-by: John Crispin <john@phrozen.org>
---

30
patches/0043-ipq40xx-add-HFCL-ION4-support.patch → patches/0042-ipq40xx-add-HFCL-ION4-support.patch
View File

@@ -1,7 +1,7 @@
From f9a7699980b31760712245ea1dab0641ac7425e1 Mon Sep 17 00:00:00 2001
From 5804d7fe3e3860c33a6957320661efd40b077a9e Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 26 Aug 2021 17:34:47 +0200
Subject: [PATCH] ipq40xx: add HFCL ION4 support
Subject: [PATCH 42/43] ipq40xx: add HFCL ION4 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -34,10 +34,10 @@ index ab489a6e18..fd7ad69eff 100644
config_load ubootenv
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 23fc4caa2e..e887e5ad1c 100644
index b222ce30d6..cd7bfc3c82 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -51,7 +51,8 @@ ALLWIFIBOARDS:= \
@@ -52,7 +52,8 @@ ALLWIFIBOARDS:= \
qxwlan_e2600ac \
cig_wf610d \
wallys_dr40x9 \
@@ -47,7 +47,7 @@ index 23fc4caa2e..e887e5ad1c 100644
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
@@ -141,5 +142,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
$(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
$(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
@@ -55,10 +55,10 @@ index 23fc4caa2e..e887e5ad1c 100644
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index efd5d002db..85fa1bcfbf 100755
index d473448137..d944d72184 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -70,6 +70,10 @@ zyxel,wre6606)
@@ -78,6 +78,10 @@ zyxel,wre6606)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
;;
@@ -70,10 +70,10 @@ index efd5d002db..85fa1bcfbf 100755
board_config_flush
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index cfcf518907..84596dcf88 100755
index 5a2a3a47f7..e4b009bf93 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -33,6 +33,7 @@ ipq40xx_setup_interfaces()
@@ -34,6 +34,7 @@ ipq40xx_setup_interfaces()
netgear,ex6100v2|\
netgear,ex6150v2|\
tp-link,ec420-g1|\
@@ -82,10 +82,10 @@ index cfcf518907..84596dcf88 100755
ucidef_set_interface_wan "eth0"
;;
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 561c8289e7..d38decf77b 100644
index 64bb4efaf8..97dd1b4039 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -162,6 +162,9 @@ case "$FIRMWARE" in
@@ -167,6 +167,9 @@ case "$FIRMWARE" in
tp-link,ec420-g1)
caldata_extract "0:ART" 0x1000 0x2f20
;;
@@ -95,7 +95,7 @@ index 561c8289e7..d38decf77b 100644
esac
;;
"ath10k/pre-cal-ahb-a800000.wifi.bin")
@@ -272,6 +275,9 @@ case "$FIRMWARE" in
@@ -283,6 +286,9 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;;
@@ -106,7 +106,7 @@ index 561c8289e7..d38decf77b 100644
;;
*)
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 7ebe0396f6..c404f32f41 100644
index 8840372ba9..53bc1adeb5 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -74,6 +74,7 @@ platform_do_upgrade() {
@@ -350,10 +350,10 @@ index 0000000000..7437b98c02
+ vlan_tag = <0 0x20>;
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 93a896e75d..ac7a5c7dfa 100644
index 540f1f2778..ae1e2e49cf 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -861,3 +861,21 @@ define Device/tp-link_ec420_g1
@@ -857,3 +857,21 @@ define Device/tp-link_ec420_g1
DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
endef
TARGET_DEVICES += tp-link_ec420_g1

8
patches/0042-ipq806x-add-edgecore_ssw2ac2600-support.patch → patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch
View File

@@ -1,7 +1,7 @@
From e5f38285a39a57f3f6faa6450e8b9e9847dfcc7a Mon Sep 17 00:00:00 2001
From 282fff50a526b7eef8f4ffbaf9c2a01c407920ad Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 18 Aug 2021 15:49:56 +0200
Subject: [PATCH] ipq806x: add edgecore_ssw2ac2600 support
Subject: [PATCH 43/43] ipq806x: add edgecore_ssw2ac2600 support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -33,7 +33,7 @@ index 96a4ee6450..1b49fd51d4 100644
ubootenv_add_uci_config "/dev/mtd11" "0x0" "0x10000" "0x10000"
;;
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 192e8dcf7e..23fc4caa2e 100644
index cd7bfc3c82..a400ac9470 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -33,6 +33,7 @@ ALLWIFIBOARDS:= \
@@ -44,7 +44,7 @@ index 192e8dcf7e..23fc4caa2e 100644
edgecore_oap100 \
engenius_eap2200 \
engenius_emd1 \
@@ -119,6 +120,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
@@ -122,6 +123,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
$(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
$(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
$(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))