From 23c2ecc3cb6f9c743f62fb83b61052bf45ae2598 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Sun, 27 Dec 2020 17:45:05 +0800
Subject: [PATCH 01/17] Update 901-arm-boot-add-dts-files.patch

---
 .../linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 7df34a8f..15b90859 100755
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -66,7 +66,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4029-gl-b1300.dtb \
 +	qcom-ipq4029-gl-s1300.dtb \
 +	qcom-ipq4029-mr33.dtb \
-	qcom-ipq4019-r619ac-64m.dtb \
++	qcom-ipq4019-r619ac-64m.dtb \
 +	qcom-ipq4019-r619ac-128m.dtb \
 +	qcom-ipq4019-l1000.dtb \
  	qcom-ipq8064-ap148.dtb \

From c9b61c80479813c8f21dedbbc9c9b60feab1723d Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Sun, 27 Dec 2020 17:51:39 +0800
Subject: [PATCH 02/17] Update 11-ath10k-caldata

---
 .../etc/hotplug.d/firmware/11-ath10k-caldata       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 10362f78..08930b9c 100755
--- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -60,7 +60,7 @@ case "$FIRMWARE" in
 	glinet,gl-s1300 |\
 	linksys,ea6350v3 |\
 	mobipromo,cm520-79f |\
-	p2w,r619ac-64m |\
+    p2w,r619ac-64m |\
 	p2w,r619ac-128m |\
 	qcom,ap-dk01.1-c1)
 		caldata_extract "ART" 0x1000 0x2f20
@@ -137,7 +137,7 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
 		;;
-	pangu,l1000)
+    pangu,l1000)
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
 		;;
@@ -170,7 +170,7 @@ case "$FIRMWARE" in
 	glinet,gl-s1300 |\
 	linksys,ea6350v3 |\
 	mobipromo,cm520-79f |\
-	p2w,r619ac-64m |\
+    p2w,r619ac-64m |\
 	p2w,r619ac-128m |\
 	qcom,ap-dk01.1-c1)
 		caldata_extract "ART" 0x5000 0x2f20
@@ -247,15 +247,15 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
 		;;
-    pangu,l1000)
-		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
-		;;
 	meraki,mr33)
 		caldata_extract_ubi "ART" 0x5000 0x2f20
 		caldata_valid "202f" || caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
 		;;
+    pangu,l1000)
+		caldata_extract "ART" 0x5000 0x2f20
+		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
+		;;
 	netgear,ex6100v2 |\
 	netgear,ex6150v2)
 		caldata_extract "ART" 0x5000 0x2f20

From a2fc632d060437c80d18d2cff0a3dc131115f40d Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 28 Dec 2020 11:18:03 +0800
Subject: [PATCH 03/17] Update 901-arm-boot-add-dts-files.patch

---
 .../linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 15b90859..11811f27 100755
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/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,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -18,7 +18,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ap120c-ac.dtb \
 +	qcom-ipq4018-dap-2610.dtb \
 +	qcom-ipq4018-cs-w3-wd1200g-eup.dtb \
-+	qcom-ipq4018-magic-2-wifi-next.dtb \
 +	qcom-ipq4018-ea6350v3.dtb \
 +	qcom-ipq4018-eap1300.dtb \
 +	qcom-ipq4018-ecw5211.dtb \

From 7e5830b6909f8622df973dc47f57f32af8ad847b Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 28 Dec 2020 13:58:16 +0800
Subject: [PATCH 04/17] Create 999-ipq40xx-unlock-cpu-frequency.patch

---
 .../999-ipq40xx-unlock-cpu-frequency.patch    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch

diff --git a/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch b/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
new file mode 100644
index 00000000..dd654f88
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
@@ -0,0 +1,57 @@
+From: William <gw826943555@qq.com>
+Subject: [PATCH] ipq40xx: improve CPU clock
+Date: Tue, 15 Dec 2020 15:28:10 +0800
+
+This patch will match the clock-latency-ns values in the device tree 
+for those found inside the OEM device tree and kernel source code and 
+unlock 896Mhz CPU operating points.
+
+Signed-off-by: William <gw826943555@qq.com>
+---
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -121,23 +121,28 @@
+ 		opp-48000000 {
+ 			opp-hz = /bits/ 64 <48000000>;
+ 			opp-microvolt = <1100000>;
+-			clock-latency-ns = <256000>;
++			clock-latency-ns = <100000>;
+ 		};
+ 		opp-200000000 {
+ 			opp-hz = /bits/ 64 <200000000>;
+ 			opp-microvolt = <1100000>;
+-			clock-latency-ns = <256000>;
++			clock-latency-ns = <100000>;
+ 		};
+ 		opp-500000000 {
+ 			opp-hz = /bits/ 64 <500000000>;
+ 			opp-microvolt = <1100000>;
+-			clock-latency-ns = <256000>;
++			clock-latency-ns = <100000>;
+ 		};
+ 		opp-716000000 {
+ 			opp-hz = /bits/ 64 <716000000>;
+ 			opp-microvolt = <1100000>;
+-			clock-latency-ns = <256000>;
++			clock-latency-ns = <100000>;
+  		};
++		opp-896000000 {
++			opp-hz = /bits/ 64 <896000000>;
++			opp-microvolt = <1100000>;
++			clock-latency-ns = <100000>;
++		};
+ 	};
+ 
+ 	pmu {
+--- a/drivers/clk/qcom/gcc-ipq4019.c
++++ b/drivers/clk/qcom/gcc-ipq4019.c
+@@ -587,6 +587,9 @@ static const struct freq_tbl ftbl_gcc_ap
+ 	F(632000000, P_DDRPLLAPSS, 1, 0, 0),
+ 	F(672000000, P_DDRPLLAPSS, 1, 0, 0),
+ 	F(716000000, P_DDRPLLAPSS, 1, 0, 0),
++	F(768000000, P_DDRPLLAPSS, 1, 0, 0),
++	F(823000000, P_DDRPLLAPSS, 1, 0, 0),
++	F(896000000, P_DDRPLLAPSS, 1, 0, 0),
+ 	{ }
+ };
+ 
\ No newline at end of file

From 06086436a75c958855782010bafe8643b07258d4 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 28 Dec 2020 14:00:31 +0800
Subject: [PATCH 05/17] Update 999-ipq40xx-unlock-cpu-frequency.patch

---
 .../999-ipq40xx-unlock-cpu-frequency.patch         | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch b/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
index dd654f88..c08658bb 100644
--- a/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
+++ b/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
@@ -1,6 +1,6 @@
 From: William <gw826943555@qq.com>
 Subject: [PATCH] ipq40xx: improve CPU clock
-Date: Tue, 15 Dec 2020 15:28:10 +0800
+Date: Tue, 15 Dec 2020 15:26:35 +0800
 
 This patch will match the clock-latency-ns values in the device tree 
 for those found inside the OEM device tree and kernel source code and 
@@ -10,42 +10,38 @@ Signed-off-by: William <gw826943555@qq.com>
 ---
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -121,23 +121,28 @@
+@@ -114,20 +114,24 @@
+ 
  		opp-48000000 {
  			opp-hz = /bits/ 64 <48000000>;
- 			opp-microvolt = <1100000>;
 -			clock-latency-ns = <256000>;
 +			clock-latency-ns = <100000>;
  		};
  		opp-200000000 {
  			opp-hz = /bits/ 64 <200000000>;
- 			opp-microvolt = <1100000>;
 -			clock-latency-ns = <256000>;
 +			clock-latency-ns = <100000>;
  		};
  		opp-500000000 {
  			opp-hz = /bits/ 64 <500000000>;
- 			opp-microvolt = <1100000>;
 -			clock-latency-ns = <256000>;
 +			clock-latency-ns = <100000>;
  		};
  		opp-716000000 {
  			opp-hz = /bits/ 64 <716000000>;
- 			opp-microvolt = <1100000>;
 -			clock-latency-ns = <256000>;
 +			clock-latency-ns = <100000>;
   		};
 +		opp-896000000 {
 +			opp-hz = /bits/ 64 <896000000>;
-+			opp-microvolt = <1100000>;
 +			clock-latency-ns = <100000>;
 +		};
  	};
  
- 	pmu {
+ 	memory {
 --- a/drivers/clk/qcom/gcc-ipq4019.c
 +++ b/drivers/clk/qcom/gcc-ipq4019.c
-@@ -587,6 +587,9 @@ static const struct freq_tbl ftbl_gcc_ap
+@@ -579,6 +579,9 @@ static const struct freq_tbl ftbl_gcc_ap
  	F(632000000, P_DDRPLLAPSS, 1, 0, 0),
  	F(672000000, P_DDRPLLAPSS, 1, 0, 0),
  	F(716000000, P_DDRPLLAPSS, 1, 0, 0),

From 2950703a94de8fead0f15f18e3e246b9693c4165 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 28 Dec 2020 17:08:24 +0800
Subject: [PATCH 06/17] Update 901-arm-boot-add-dts-files.patch

---
 .../linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 11811f27..badd99bb 100755
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/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,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -27,7 +27,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ex6100v2.dtb \
 +	qcom-ipq4018-ex6150v2.dtb \
 +	qcom-ipq4018-fritzbox-4040.dtb \
-+	qcom-ipq4018-gl-ap1300.dtb \
 +	qcom-ipq4018-jalapeno.dtb \
 +	qcom-ipq4018-meshpoint-one.dtb \
 +	qcom-ipq4018-nbg6617.dtb \

From 22f94c8be6f4c13deeade90491714a89cd4f029c Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 30 Dec 2020 20:12:02 +0800
Subject: [PATCH 07/17] Create config-antrouter5g18

---
 config-antrouter5g18 | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 config-antrouter5g18

diff --git a/config-antrouter5g18 b/config-antrouter5g18
new file mode 100755
index 00000000..45e3bddc
--- /dev/null
+++ b/config-antrouter5g18
@@ -0,0 +1,12 @@
+CONFIG_TARGET_ipq40xx=y
+CONFIG_TARGET_ipq40xx_generic=y
+CONFIG_TARGET_ipq40xx_generic_DEVICE_8dev_jalapeno=y
+CONFIG_TARGET_BOARD="ipq40xx"
+CONFIG_TARGET_SUBTARGET="generic"
+CONFIG_TARGET_PROFILE="DEVICE_8dev_jalapeno"
+CONFIG_TARGET_ARCH_PACKAGES="arm_cortex-a7_neon-vfpv4"
+CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y
+CONFIG_DEFAULT_kmod-ath10k-ct=y
+CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y
+CONFIG_KERNEL_ARM_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
\ No newline at end of file

From e5faa64e5793fa9aef87b496141948ad982e6cf1 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 30 Dec 2020 20:20:56 +0800
Subject: [PATCH 08/17] fix

---
 config-antrouter5g18 => config-espressobin1 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename config-antrouter5g18 => config-espressobin1 (100%)

diff --git a/config-antrouter5g18 b/config-espressobin1
similarity index 100%
rename from config-antrouter5g18
rename to config-espressobin1

From bc14d95b5a58fac1662070b206abe82646ad5896 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 30 Dec 2020 20:23:31 +0800
Subject: [PATCH 09/17] Update build.sh

---
 build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.sh b/build.sh
index 84d400dc..a04d2cab 100755
--- a/build.sh
+++ b/build.sh
@@ -199,6 +199,9 @@ fi
 if [ "$OMR_PACKAGES" = "mini" ]; then
 	echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config"
 fi
+if [ "$OMR_PACKAGES" = "zuixiao" ]; then
+	echo "CONFIG_PACKAGE_${OMR_DIST}-zuixiao=y" >> "$OMR_TARGET/source/.config"
+fi
 
 cd "$OMR_TARGET/source"
 

From 8dc3a0244f81e66585e4f67ed2d33bde25f03a31 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Thu, 31 Dec 2020 11:49:21 +0800
Subject: [PATCH 10/17] Update config-espressobin1

---
 config-espressobin1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config-espressobin1 b/config-espressobin1
index 45e3bddc..f0cb5bcc 100755
--- a/config-espressobin1
+++ b/config-espressobin1
@@ -8,5 +8,6 @@ CONFIG_TARGET_ARCH_PACKAGES="arm_cortex-a7_neon-vfpv4"
 CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y
 CONFIG_DEFAULT_kmod-ath10k-ct=y
 CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y
+CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
 CONFIG_KERNEL_TCP_CONG_BBR2=y
\ No newline at end of file

From 785db78cd60ec7e5dfe951eb103fa1b70dce1b64 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 28 Dec 2020 14:43:01 +0100
Subject: [PATCH 11/17] Remove some bpi changes

---
 .../lib/preinit/06_set_rps_sock_flow          |  8 --
 .../base-files/lib/preinit/07_set_iface_mac   | 48 -----------
 .../base-files/lib/preinit/79_move_config     | 19 -----
 .../base-files/lib/preinit/90_init_jffs2      |  7 --
 .../base-files/lib/upgrade/platform.sh        | 85 -------------------
 5 files changed, 167 deletions(-)
 delete mode 100644 root/target/linux/mediatek/base-files/lib/preinit/06_set_rps_sock_flow
 delete mode 100644 root/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac
 delete mode 100644 root/target/linux/mediatek/base-files/lib/preinit/79_move_config
 delete mode 100644 root/target/linux/mediatek/base-files/lib/preinit/90_init_jffs2
 delete mode 100755 root/target/linux/mediatek/base-files/lib/upgrade/platform.sh

diff --git a/root/target/linux/mediatek/base-files/lib/preinit/06_set_rps_sock_flow b/root/target/linux/mediatek/base-files/lib/preinit/06_set_rps_sock_flow
deleted file mode 100644
index 9a84ff4b..00000000
--- a/root/target/linux/mediatek/base-files/lib/preinit/06_set_rps_sock_flow
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set_rps_sock_flow() {
-	echo 1024 > /proc/sys/net/core/rps_sock_flow_entries
-}
-
-boot_hook_add preinit_main set_rps_sock_flow
-
diff --git a/root/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac b/root/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac
deleted file mode 100644
index 1ad70145..00000000
--- a/root/target/linux/mediatek/base-files/lib/preinit/07_set_iface_mac
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2018 OpenWrt.org
-
-RECOVERY_PART=/dev/mmcblk0p1
-
-preinit_set_mac_address() {
-	local mac
-
-	. /lib/functions.sh
-	. /lib/functions/system.sh
-
-	case $(board_name) in
-	'bananapi,bpi-r2'|\
-	"unielec,u7623"*)
-		if [ -b $RECOVERY_PART ]; then
-			insmod nls_cp437
-			insmod nls_iso8859-1
-			insmod fat
-			insmod vfat
-			mkdir -p /tmp/recovery
-			mount -o rw,noatime $RECOVERY_PART /tmp/recovery
-
-			if [ -f "/tmp/recovery/mac_addr" ];
-			then
-				mac=$(cat /tmp/recovery/mac_addr)
-			else
-				mac=$(cat /sys/class/net/eth0/address)
-				echo "$mac" > /tmp/recovery/mac_addr
-			fi
-
-			sync
-			umount /tmp/recovery
-			rm -rf /tmp/recovery
-		fi
-
-		ip link set dev lan address $mac 2> /dev/null
-
-		mac=$(macaddr_add $mac 1)
-
-		ip link set dev wan1 address $mac 2>/dev/null
-		ip link set dev wan2 address $mac 2>/dev/null
-		ip link set dev wan3 address $mac 2>/dev/null
-		ip link set dev wan4 address $mac 2>/dev/null
-		;;
-	esac
-}
-
-boot_hook_add preinit_main preinit_set_mac_address
diff --git a/root/target/linux/mediatek/base-files/lib/preinit/79_move_config b/root/target/linux/mediatek/base-files/lib/preinit/79_move_config
deleted file mode 100644
index e8e62883..00000000
--- a/root/target/linux/mediatek/base-files/lib/preinit/79_move_config
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2015 OpenWrt.org
-
-RECOVERY_PART=/dev/mmcblk0p1
-
-move_config() {
-	if [ -b $RECOVERY_PART ]; then
-		insmod nls_cp437
-		insmod nls_iso8859-1
-		insmod fat
-		insmod vfat
-		mkdir -p /recovery
-		mount -o rw,noatime $RECOVERY_PART /recovery
-		[ -f /recovery/sysupgrade.tgz ] && mv -f /recovery/sysupgrade.tgz /
-		umount /recovery
-	fi
-}
-
-boot_hook_add preinit_mount_root move_config
diff --git a/root/target/linux/mediatek/base-files/lib/preinit/90_init_jffs2 b/root/target/linux/mediatek/base-files/lib/preinit/90_init_jffs2
deleted file mode 100644
index 8a510b74..00000000
--- a/root/target/linux/mediatek/base-files/lib/preinit/90_init_jffs2
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-do_firstboot() {
-	if [ "$(mount | grep jffs2)" = "" ]; then
-		/sbin/firstboot -y
-	fi
-}
-boot_hook_add preinit_main do_firstboot
\ No newline at end of file
diff --git a/root/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/root/target/linux/mediatek/base-files/lib/upgrade/platform.sh
deleted file mode 100755
index ee69952e..00000000
--- a/root/target/linux/mediatek/base-files/lib/upgrade/platform.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-platform_do_upgrade() {
-	local board=$(board_name)
-	case "$board" in
-	"unielec,u7623"*)
-		#Keep the persisten random mac address (if it exists)
-		mkdir -p /tmp/recovery
-		mount -o rw,noatime /dev/mmcblk0p1 /tmp/recovery
-		[ -f "/tmp/recovery/mac_addr" ] && \
-			mv -f /tmp/recovery/mac_addr /tmp/
-		umount /tmp/recovery
-
-		#1310720 is the offset in bytes from the start of eMMC and to
-		#the location of the kernel (2560 512 byte sectors)
-		get_image "$1" | dd of=/dev/mmcblk0 bs=1310720 seek=1 conv=fsync
-
-		mount -o rw,noatime /dev/mmcblk0p1 /tmp/recovery
-		[ -f "/tmp/mac_addr" ] && mv -f /tmp/mac_addr /tmp/recovery
-		sync
-		umount /tmp/recovery
-		;;
-	bananapi,bpi-r2)
-		local tar_file="$1"
-
-		echo "flashing kernel"
-		tar xf $tar_file sysupgrade-7623n-bananapi-bpi-r2/kernel -O | mtd write - kernel
-
-		echo "flashing rootfs"
-		tar xf $tar_file sysupgrade-7623n-bananapi-bpi-r2/root -O | mtd write - rootfs
-		;;
-	*)
-		default_do_upgrade "$ARGV"
-		;;
-	esac
-}
-
-PART_NAME=firmware
-
-platform_check_image() {
-	local board=$(board_name)
-
-	[ "$#" -gt 1 ] && return 1
-
-	case "$board" in
-	bananapi,bpi-r2)
-		local tar_file="$1"
-		local kernel_length=`(tar xf $tar_file sysupgrade-7623n-bananapi-bpi-r2/kernel -O | wc -c) 2> /dev/null`
-		local rootfs_length=`(tar xf $tar_file sysupgrade-7623n-bananapi-bpi-r2/root -O | wc -c) 2> /dev/null`
-		[ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
-			echo "The upgrade image is corrupt."
-			return 1
-		}
-		;;
-	"unielec,u7623"*)
-		local magic="$(get_magic_long "$1")"
-		[ "$magic" != "27051956" ] && {
-			echo "Invalid image type."
-			return 1
-		}
-		return 0
-		;;
-
-	*)
-		echo "Sysupgrade is not supported on your board yet."
-		return 1
-		;;
-	esac
-
-	return 0
-}
-
-platform_copy_config_emmc() {
-	mkdir -p /recovery
-	mount -o rw,noatime /dev/mmcblk0p1 /recovery
-	cp -af "$CONF_TAR" /recovery/
-	sync
-	umount /recovery
-}
-
-platform_copy_config() {
-	case "$(board_name)" in
-	"unielec,u7623"*)
-		platform_copy_config_emmc
-		;;
-	esac
-}

From 94f6bbd838d08f7f6683d70e4e351fa89e853482 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 30 Dec 2020 16:53:02 +0100
Subject: [PATCH 12/17] Close issues after 90 days instead of 120

---
 .github/workflows/stale.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 0df84802..7c2090c3 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/stale@v3.0.10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: "This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days"
-          stale-pr-message: 'It has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days'
-          days-before-stale: 120
+          stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days"
+          stale-pr-message: 'It has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days'
+          days-before-stale: 90
           days-before-close: 5
           exempt-issue-labels: 'work-in-progress,enhancement'
           exempt-pr-labels: 'work-in-progress,enhancement'

From 900d8e4d81551e16bc15cdd280cf50230947da1d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 30 Dec 2020 18:16:40 +0100
Subject: [PATCH 13/17] Fix banner version

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 8a3ebd24..d56c61d8 100755
--- a/build.sh
+++ b/build.sh
@@ -116,7 +116,7 @@ cp -rf root/* "$OMR_TARGET/source"
 cat >> "$OMR_TARGET/source/package/base-files/files/etc/banner" <<EOF
 -----------------------------------------------------
  PACKAGE:     $OMR_DIST
- VERSION:     $(git -C "$OMR_FEED" describe --tag --always)
+ VERSION:     $(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)
 
  BUILD REPO:  $(git config --get remote.origin.url)
  BUILD DATE:  $(date -u)

From 54fb00aed8e6702fc4efdc322f0833d6d7bfef28 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Thu, 31 Dec 2020 12:30:35 +0800
Subject: [PATCH 14/17] Update config-espressobin1

---
 config-espressobin1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config-espressobin1 b/config-espressobin1
index f0cb5bcc..9c715409 100755
--- a/config-espressobin1
+++ b/config-espressobin1
@@ -5,9 +5,8 @@ CONFIG_TARGET_BOARD="ipq40xx"
 CONFIG_TARGET_SUBTARGET="generic"
 CONFIG_TARGET_PROFILE="DEVICE_8dev_jalapeno"
 CONFIG_TARGET_ARCH_PACKAGES="arm_cortex-a7_neon-vfpv4"
-CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y
-CONFIG_DEFAULT_kmod-ath10k-ct=y
-CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y
+CONFIG_PACKAGE_ath10k-board-qca4019=y
+CONFIG_PACKAGE_ath10k-firmware-qca4019-ct-htt=y
 CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
 CONFIG_KERNEL_TCP_CONG_BBR2=y
\ No newline at end of file

From c0f947c6271011832d298d5496d69fd6ba08e733 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Thu, 31 Dec 2020 16:55:47 +0800
Subject: [PATCH 15/17] fix ipq40xx

---
 .../wireless-regdb/patches/501-CN-regd.patch  |  24 ----
 .../mac80211/files/lib/wifi/mac80211.sh       | 127 ------------------
 .../etc/hotplug.d/net/21_adjust_network       |   7 -
 .../ipq40xx/base-files/etc/init.d/bootcount   |  16 ---
 .../{adjust_network => set_smp_affinity}      |   2 +-
 .../ipq40xx/base-files/lib/adjust_network.sh  |  89 ------------
 .../base-files/lib/upgrade/openmesh.sh        |   0
 .../base-files/lib/upgrade/platform.sh        |   0
 8 files changed, 1 insertion(+), 264 deletions(-)
 delete mode 100755 root/package/firmware/wireless-regdb/patches/501-CN-regd.patch
 delete mode 100755 root/package/kernel/mac80211/files/lib/wifi/mac80211.sh
 delete mode 100755 root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network
 delete mode 100755 root/target/linux/ipq40xx/base-files/etc/init.d/bootcount
 rename root/target/linux/ipq40xx/base-files/etc/init.d/{adjust_network => set_smp_affinity} (99%)
 delete mode 100755 root/target/linux/ipq40xx/base-files/lib/adjust_network.sh
 mode change 100644 => 100755 root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
 mode change 100644 => 100755 root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh

diff --git a/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch b/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch
deleted file mode 100755
index 198d1978..00000000
--- a/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uprN a/db.txt b/db.txt
---- a/db.txt	2020-01-06 19:33:27.707188000 +0800
-+++ b/db.txt	2020-01-06 19:39:28.663199594 +0800
-@@ -291,15 +291,15 @@ country CL: DFS-JP
- 	(5735 - 5835 @ 80), (20)
- 
- country CN: DFS-FCC
--	(2402 - 2482 @ 40), (20)
--	(5170 - 5250 @ 80), (23), AUTO-BW
--	(5250 - 5330 @ 80), (23), DFS, AUTO-BW
-+	(2402 - 2482 @ 40), (30)
-+	(5170 - 5250 @ 80), (30), AUTO-BW
-+	(5250 - 5330 @ 80), (30), DFS, AUTO-BW
- 	(5735 - 5835 @ 80), (30)
- 	# 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm
- 	# ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
--	(57240 - 59400 @ 2160), (28)
-+	(57240 - 59400 @ 2160), (30)
- 	(59400 - 63720 @ 2160), (44)
--	(63720 - 65880 @ 2160), (28)
-+	(63720 - 65880 @ 2160), (30)
- 
- country CO: DFS-FCC
- 	(2402 - 2482 @ 40), (20)
diff --git a/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh
deleted file mode 100755
index bf1dddd5..00000000
--- a/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-. /lib/netifd/mac80211.sh
-
-append DRIVERS "mac80211"
-
-lookup_phy() {
-	[ -n "$phy" ] && {
-		[ -d /sys/class/ieee80211/$phy ] && return
-	}
-
-	local devpath
-	config_get devpath "$device" path
-	[ -n "$devpath" ] && {
-		phy="$(mac80211_path_to_phy "$devpath")"
-		[ -n "$phy" ] && return
-	}
-
-	local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')"
-	[ -n "$macaddr" ] && {
-		for _phy in /sys/class/ieee80211/*; do
-			[ -e "$_phy" ] || continue
-
-			[ "$macaddr" = "$(cat ${_phy}/macaddress)" ] || continue
-			phy="${_phy##*/}"
-			return
-		done
-	}
-	phy=
-	return
-}
-
-find_mac80211_phy() {
-	local device="$1"
-
-	config_get phy "$device" phy
-	lookup_phy
-	[ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || {
-		echo "PHY for wifi device $1 not found"
-		return 1
-	}
-	config_set "$device" phy "$phy"
-
-	config_get macaddr "$device" macaddr
-	[ -z "$macaddr" ] && {
-		config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)"
-	}
-
-	return 0
-}
-
-check_mac80211_device() {
-	config_get phy "$1" phy
-	[ -z "$phy" ] && {
-		find_mac80211_phy "$1" >/dev/null || return 0
-		config_get phy "$1" phy
-	}
-	[ "$phy" = "$dev" ] && found=1
-}
-
-detect_mac80211() {
-	devidx=0
-	config_load wireless
-	while :; do
-		config_get type "radio$devidx" type
-		[ -n "$type" ] || break
-		devidx=$(($devidx + 1))
-	done
-
-	for _dev in /sys/class/ieee80211/*; do
-		[ -e "$_dev" ] || continue
-
-		dev="${_dev##*/}"
-
-		found=0
-		config_foreach check_mac80211_device wifi-device
-		[ "$found" -gt 0 ] && continue
-
-		mode_band="g"
-		channel="13"
-		htmode=""
-		ht_capab=""
-
-		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT40
-
-		iw phy "$dev" info | grep -q '\* 5... MHz \[' && {
-			mode_band="a"
-			channel=$(iw phy "$dev" info | grep '\* 5... MHz \[' | grep '(disabled)' -v -m 1 | sed 's/[^[]*\[\|\].*//g')
-			iw phy "$dev" info | grep -q 'VHT Capabilities' && htmode="VHT80"
-		}
-
-		[ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode"
-
-		path="$(mac80211_phy_to_path "$dev")"
-		if [ -n "$path" ]; then
-			dev_id="set wireless.radio${devidx}.path='$path'"
-		else
-			dev_id="set wireless.radio${devidx}.macaddr=$(cat /sys/class/ieee80211/${dev}/macaddress)"
-		fi
-                if [ x$mode_band == x"a" ]; then
-			ssid_5ghz="-5G"
-		else
-			ssid_5ghz="-2.4G"
-		fi
-
-		uci -q batch <<-EOF
-			set wireless.radio${devidx}=wifi-device
-			set wireless.radio${devidx}.type=mac80211
-			set wireless.radio${devidx}.channel=${channel}
-			set wireless.radio${devidx}.hwmode=11${mode_band}
-			set wireless.radio${devidx}.txpower=22
-                        set wireless.radio${devidx}.country=CN
-			${dev_id}
-			${ht_capab}
-			set wireless.radio${devidx}.disabled=0
-
-			set wireless.default_radio${devidx}=wifi-iface
-			set wireless.default_radio${devidx}.device=radio${devidx}
-			set wireless.default_radio${devidx}.network=lan
-			set wireless.default_radio${devidx}.mode=ap
-			set wireless.default_radio${devidx}.ssid=OpenWrt${ssid_5ghz}-$(cat /sys/class/ieee80211/${dev}/macaddress | awk -F ":" '{print $4""$5""$6 }'| tr a-z A-Z)
-			set wireless.default_radio${devidx}.encryption=none
-EOF
-		uci -q commit wireless
-
-		devidx=$(($devidx + 1))
-	done
-}
diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network
deleted file mode 100755
index 2caf2494..00000000
--- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ -f /lib/adjust_network.sh ] && {
-	. /lib/adjust_network.sh
-
-	adjust_eth_queue
-}
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount b/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount
deleted file mode 100755
index 68c5fc11..00000000
--- a/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-
-boot() {
-	case $(board_name) in
-	alfa-network,ap120c-ac)
-		[ -n "$(fw_printenv bootcount changed 2>/dev/null)" ] &&\
-			echo -e "bootcount\nchanged\n" | /usr/sbin/fw_setenv -s -
-		;;
-	linksys,ea6350v3|\
-	linksys,ea8300)
-		mtd resetbc s_env || true
-		;;
-	esac
-}
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network b/root/target/linux/ipq40xx/base-files/etc/init.d/set_smp_affinity
similarity index 99%
rename from root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network
rename to root/target/linux/ipq40xx/base-files/etc/init.d/set_smp_affinity
index 6089259e..4ce4bf4f 100755
--- a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network
+++ b/root/target/linux/ipq40xx/base-files/etc/init.d/set_smp_affinity
@@ -202,4 +202,4 @@ set_irqs() {
 start() {
 	set_interface_queues
 	set_irqs
-}
\ No newline at end of file
+}
diff --git a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh b/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh
deleted file mode 100755
index d4829b09..00000000
--- a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# this scripts is used for adjust cpu's choice of interrupts.
-#
-
-################################################
-# Adjust smp_affinity of edma
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    execute only once on start-up.
-################################################
-adjust_edma_smp_affinity() {
-	grep -q edma_eth_ /proc/interrupts || return 0
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local cpu=0
-	local tx_irq_num
-
-	for tx_num in `seq 0 1 15` ; do
-		cpu=`printf "%x" $((1<<((tx_num/4+0)%nr)))`
-		tx_irq_num=`grep -m1 edma_eth_tx$tx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$tx_irq_num" ] && echo $cpu > /proc/irq/$tx_irq_num/smp_affinity
-	done
-
-	for rx_num in `seq 0 1 7` ; do
-		cpu=`printf "%x" $((1<<((rx_num/2)%nr)))`
-		rx_irq_num=`grep -m1 edma_eth_rx$rx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$rx_irq_num" ] && echo $cpu > /proc/irq/$rx_irq_num/smp_affinity
-	done
-}
-
-################################################
-# Adjust smp_affinity of ath10k for 2G and 5G
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    execute only once on start-up.
-################################################
-adjust_radio_smp_affinity() {
-	local irqs="`grep -E 'ath10k' /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`"
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local idx=2
-
-	for irq in $irqs; do
-		cpu=`printf "%x" $((1<<((idx)%nr)))`
-		echo $cpu > /proc/irq/$irq/smp_affinity
-		idx=$((idx+1))
-	done
-}
-
-################################################
-# Adjust queue of eth
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    Each network reboot needs to be executed.
-################################################
-adjust_eth_queue() {
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local idx=0
-
-	for epath in /sys/class/net/eth[0-9]*; do
-		test -e $epath || break
-		echo $epath | grep -q "\." && continue
-		eth=`basename $epath`
-		idx=0
-		for exps in /sys/class/net/$eth/queues/rx-[0-9]*/rps_cpus; do
-			test -e $exps || break
-			cpu=`printf "%x" $((1<<((idx+1)%nr)))`
-			idx=$((idx+1))
-			echo $cpu > $exps
-			echo 256 > `dirname $exps`/rps_flow_cnt
-		done
-		which ethtool >/dev/null 2>&1 && ethtool -K $eth gro off
-	done
-
-	echo 1024 > /proc/sys/net/core/rps_sock_flow_entries
-}
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
old mode 100644
new mode 100755
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
old mode 100644
new mode 100755

From 3fd8240016132326a36a32af2b82cf391cd291be Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Sun, 3 Jan 2021 15:31:36 +0800
Subject: [PATCH 16/17] fix quanxian

---
 root/target/linux/generic/config-4.14                             | 0
 root/target/linux/generic/config-4.19                             | 0
 root/target/linux/generic/config-4.9                              | 0
 root/target/linux/generic/config-5.4                              | 0
 root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch         | 0
 root/target/linux/generic/hack-4.14/998-ndpi-netfilter.patch      | 0
 .../linux/generic/hack-4.14/999-stop-promiscuous-info.patch       | 0
 root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch         | 0
 root/target/linux/generic/hack-4.19/691-mptcp_ecf.patch           | 0
 root/target/linux/generic/hack-4.19/692-tcp_nanqinlang.patch      | 0
 root/target/linux/generic/hack-4.19/998-ndpi-netfilter.patch      | 0
 root/target/linux/generic/hack-4.19/999-f2fs-ioerrorfix.patch     | 0
 .../linux/generic/hack-4.19/999-stop-promiscuous-info.patch       | 0
 root/target/linux/generic/hack-4.9/690-mptcp_v0.93.patch          | 0
 root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch          | 0
 root/target/linux/generic/hack-5.4/692-tcp_nanqinlang.patch       | 0
 root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch             | 0
 root/target/linux/generic/hack-5.4/998-ndpi-netfilter.patch       | 0
 .../target/linux/generic/hack-5.4/999-stop-promiscuous-info.patch | 0
 .../linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts  | 0
 .../ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch    | 0
 21 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 root/target/linux/generic/config-4.14
 mode change 100644 => 100755 root/target/linux/generic/config-4.19
 mode change 100644 => 100755 root/target/linux/generic/config-4.9
 mode change 100644 => 100755 root/target/linux/generic/config-5.4
 mode change 100644 => 100755 root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.14/998-ndpi-netfilter.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.14/999-stop-promiscuous-info.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/691-mptcp_ecf.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/692-tcp_nanqinlang.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/998-ndpi-netfilter.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/999-f2fs-ioerrorfix.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.19/999-stop-promiscuous-info.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-4.9/690-mptcp_v0.93.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-5.4/692-tcp_nanqinlang.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-5.4/998-ndpi-netfilter.patch
 mode change 100644 => 100755 root/target/linux/generic/hack-5.4/999-stop-promiscuous-info.patch
 mode change 100644 => 100755 root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts
 mode change 100644 => 100755 root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch

diff --git a/root/target/linux/generic/config-4.14 b/root/target/linux/generic/config-4.14
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/config-4.19 b/root/target/linux/generic/config-4.19
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/config-4.9 b/root/target/linux/generic/config-4.9
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.14/998-ndpi-netfilter.patch b/root/target/linux/generic/hack-4.14/998-ndpi-netfilter.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.14/999-stop-promiscuous-info.patch b/root/target/linux/generic/hack-4.14/999-stop-promiscuous-info.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch b/root/target/linux/generic/hack-4.19/690-mptcp_v0.95.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/691-mptcp_ecf.patch b/root/target/linux/generic/hack-4.19/691-mptcp_ecf.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/692-tcp_nanqinlang.patch b/root/target/linux/generic/hack-4.19/692-tcp_nanqinlang.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/998-ndpi-netfilter.patch b/root/target/linux/generic/hack-4.19/998-ndpi-netfilter.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/999-f2fs-ioerrorfix.patch b/root/target/linux/generic/hack-4.19/999-f2fs-ioerrorfix.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.19/999-stop-promiscuous-info.patch b/root/target/linux/generic/hack-4.19/999-stop-promiscuous-info.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-4.9/690-mptcp_v0.93.patch b/root/target/linux/generic/hack-4.9/690-mptcp_v0.93.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch b/root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-5.4/692-tcp_nanqinlang.patch b/root/target/linux/generic/hack-5.4/692-tcp_nanqinlang.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch b/root/target/linux/generic/hack-5.4/693-tcp_bbr2.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-5.4/998-ndpi-netfilter.patch b/root/target/linux/generic/hack-5.4/998-ndpi-netfilter.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/generic/hack-5.4/999-stop-promiscuous-info.patch b/root/target/linux/generic/hack-5.4/999-stop-promiscuous-info.patch
old mode 100644
new mode 100755
diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts
old mode 100644
new mode 100755
diff --git a/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch b/root/target/linux/ipq40xx/patches-5.4/999-ipq40xx-unlock-cpu-frequency.patch
old mode 100644
new mode 100755

From 3dd6261705562728dfc7d8fc9c67554fb6dc7222 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Sun, 3 Jan 2021 20:05:16 +0800
Subject: [PATCH 17/17] fix

---
 .../ipq-wifi/board-p2w_r619ac.qca4019         | Bin 24300 -> 24308 bytes
 .../ipq40xx/base-files/etc/board.d/01_leds    |   5 --
 .../ipq40xx/base-files/etc/board.d/02_network |   4 +-
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |  14 +--
 .../base-files/lib/upgrade/platform.sh        |   6 +-
 .../arm/boot/dts/qcom-ipq4019-r619ac.dtsi     |  30 +++++++
 root/target/linux/ipq40xx/image/Makefile      |  84 +++++++++---------
 .../901-arm-boot-add-dts-files.patch          |  10 ++-
 8 files changed, 90 insertions(+), 63 deletions(-)
 mode change 100755 => 100644 root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019

diff --git a/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 b/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019
old mode 100755
new mode 100644
index a1b1166f6f9dd713fd5d45bbf50767a03703e902..0ebe28575f16e782b2a3a30c4da82c3e1485118e
GIT binary patch
delta 63
zcmaE}m+{M9#t9Of8Tt%hU@=kAkR?DZTw!C7kv_7hI-j{tSz=LUVqS?YNPhD^eLZ~u
D3`r1E

delta 44
ocmeyem+{SB#t9OfDf$dxU@}qBaATN}K0;vfM18}}$Mp5|0T);cc>n+a

diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index c80ae3fe..39278959 100755
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -57,11 +57,6 @@ pangu,l1000)
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt"
 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
     ;;
-p2w,r619ac |\
-p2w,r619ac-128m)
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt"
-	;;
 netgear,ex6100v2 |\
 netgear,ex6150v2)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt"
diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 63f8e52c..c74f95a6 100755
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -48,7 +48,7 @@ ipq40xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
 	asus,rt-ac58u|\
-	p2w,r619ac-64m|\
+    p2w,r619ac-64m|\
 	p2w,r619ac-128m|\
 	zyxel,nbg6617)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
@@ -57,8 +57,8 @@ ipq40xx_setup_interfaces()
 		;;
 	avm,fritzbox-4040|\
 	linksys,ea6350v3|\
+    pangu,l1000|\
 	linksys,ea8300|\
-	pangu,l1000|\
 	linksys,mr8300)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 08930b9c..370cefa1 100755
--- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -61,7 +61,7 @@ case "$FIRMWARE" in
 	linksys,ea6350v3 |\
 	mobipromo,cm520-79f |\
     p2w,r619ac-64m |\
-	p2w,r619ac-128m |\
+ 	p2w,r619ac-128m |\
 	qcom,ap-dk01.1-c1)
 		caldata_extract "ART" 0x1000 0x2f20
 		;;
@@ -170,8 +170,8 @@ case "$FIRMWARE" in
 	glinet,gl-s1300 |\
 	linksys,ea6350v3 |\
 	mobipromo,cm520-79f |\
-    p2w,r619ac-64m |\
-	p2w,r619ac-128m |\
+	p2w,r619ac-64m |\
+ 	p2w,r619ac-128m |\
 	qcom,ap-dk01.1-c1)
 		caldata_extract "ART" 0x5000 0x2f20
 		;;
@@ -247,15 +247,15 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
 		;;
+    pangu,l1000)
+		caldata_extract "ART" 0x5000 0x2f20
+		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
+		;;
 	meraki,mr33)
 		caldata_extract_ubi "ART" 0x5000 0x2f20
 		caldata_valid "202f" || caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
 		;;
-    pangu,l1000)
-		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
-		;;
 	netgear,ex6100v2 |\
 	netgear,ex6150v2)
 		caldata_extract "ART" 0x5000 0x2f20
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 4b937bed..396bc5d9 100755
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -57,11 +57,9 @@ zyxel_do_upgrade() {
 
 platform_do_upgrade() {
 	case "$(board_name)" in
-	pangu,l1000 |\
-	p2w,r619ac-64m |\
-	p2w,r619ac-128m |\
 	8dev,jalapeno |\
 	aruba,ap-303 |\
+    pangu,l1000 |\
 	aruba,ap-303h |\
 	aruba,ap-365 |\
 	avm,fritzbox-7530 |\
@@ -75,6 +73,8 @@ platform_do_upgrade() {
 	glinet,gl-ap1300 |\
 	luma,wrtq-329acn |\
 	mobipromo,cm520-79f |\
+    p2w,r619ac-64m |\
+ 	p2w,r619ac-128m |\
 	qxwlan,e2600ac-c2)
 		nand_do_upgrade "$1"
 		;;
diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
index 6f002a92..c9110fe5 100755
--- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
+++ b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
@@ -262,6 +262,36 @@
 	};
 };
 
+&ethphy0 {
+	qcom,single-led-1000;
+	qcom,single-led-100;
+	qcom,single-led-10;
+};
+
+&ethphy1 {
+	qcom,single-led-1000;
+	qcom,single-led-100;
+	qcom,single-led-10;
+};
+
+&ethphy2 {
+	qcom,single-led-1000;
+	qcom,single-led-100;
+	qcom,single-led-10;
+};
+
+&ethphy3 {
+	qcom,single-led-1000;
+	qcom,single-led-100;
+	qcom,single-led-10;
+};
+
+&ethphy4 {
+	qcom,single-led-1000;
+	qcom,single-led-100;
+	qcom,single-led-10;
+};
+
 &usb3_ss_phy {
 	status = "okay";
 };
diff --git a/root/target/linux/ipq40xx/image/Makefile b/root/target/linux/ipq40xx/image/Makefile
index 65561b7e..16817dcd 100755
--- a/root/target/linux/ipq40xx/image/Makefile
+++ b/root/target/linux/ipq40xx/image/Makefile
@@ -682,6 +682,48 @@ define Device/openmesh_a62
 endef
 TARGET_DEVICES += openmesh_a62
 
+
+define Device/p2w_r619ac
+ 	$(call Device/FitzImage)
+ 	$(call Device/UbiFit)
+ 	DEVICE_VENDOR := P&W
+ 	DEVICE_MODEL := R619AC
+ 	SOC := qcom-ipq4019
+ 	DEVICE_DTS_CONFIG := config@10
+ 	BLOCKSIZE := 128k
+ 	PAGESIZE := 2048
+ 	DEVICE_PACKAGES := ipq-wifi-p2w_r619ac
+ endef
+
+ define Device/p2w_r619ac-64m
+ 	$(call Device/p2w_r619ac)
+ 	DEVICE_VARIANT := 64M NAND
+ 	IMAGES += nand-factory.bin
+ 	IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+ endef
+ TARGET_DEVICES += p2w_r619ac-64m
+
+ define Device/p2w_r619ac-128m
+ 	$(call Device/p2w_r619ac)
+ 	DEVICE_VARIANT := 128M NAND
+ endef
+ TARGET_DEVICES += p2w_r619ac-128m
+
+define Device/pangu_l1000
+	$(call Device/FitImage)
+	$(call Device/UbiFit)
+	DEVICE_VENDOR := PANGU
+	DEVICE_MODEL := L1000
+	SOC := qcom-ipq4019
+	DEVICE_DTS := qcom-ipq4019-l1000
+	KERNEL_INSTALL := 1
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	BOARD_NAME := l1000
+	DEVICE_PACKAGES := ipq-wifi-pangu_l1000
+endef
+TARGET_DEVICES += pangu_l1000
+
 define Device/plasmacloud_pa1200
 	$(call Device/FitImageLzma)
 	DEVICE_VENDOR := Plasma Cloud
@@ -745,48 +787,6 @@ define Device/qcom_ap-dk04.1-c1
 endef
 TARGET_DEVICES += qcom_ap-dk04.1-c1
 
-define Device/p2w_r619ac
-	$(call Device/FitzImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := P&W
-	DEVICE_MODEL := R619AC
-	SOC := qcom-ipq4019
-	DEVICE_DTS_CONFIG := config@10
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_PACKAGES := ipq-wifi-p2w_r619ac
-endef
-
-define Device/p2w_r619ac-64m
-	$(call Device/p2w_r619ac)
-	DEVICE_VARIANT := 64M NAND
-	IMAGES += nand-factory.bin
-	IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
-endef
-TARGET_DEVICES += p2w_r619ac-64m
-
-define Device/p2w_r619ac-128m
-	$(call Device/p2w_r619ac)
-	DEVICE_VARIANT := 128M NAND
-endef
-TARGET_DEVICES += p2w_r619ac-128m
-
-define Device/pangu_l1000
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := PANGU
-	DEVICE_MODEL := L1000
-	SOC := qcom-ipq4019
-	DEVICE_DTS := qcom-ipq4019-l1000
-	KERNEL_INSTALL := 1
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	BOARD_NAME := l1000
-	DEVICE_PACKAGES := ipq-wifi-pangu_l1000
-endef
-TARGET_DEVICES += pangu_l1000
-
-
 define Device/qxwlan_e2600ac-c1
 	$(call Device/FitImage)
 	DEVICE_VENDOR := Qxwlan
diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index badd99bb..42faa353 100755
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/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,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -18,6 +18,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ap120c-ac.dtb \
 +	qcom-ipq4018-dap-2610.dtb \
 +	qcom-ipq4018-cs-w3-wd1200g-eup.dtb \
++	qcom-ipq4018-magic-2-wifi-next.dtb \
 +	qcom-ipq4018-ea6350v3.dtb \
 +	qcom-ipq4018-eap1300.dtb \
 +	qcom-ipq4018-ecw5211.dtb \
@@ -27,6 +28,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ex6100v2.dtb \
 +	qcom-ipq4018-ex6150v2.dtb \
 +	qcom-ipq4018-fritzbox-4040.dtb \
++	qcom-ipq4018-gl-ap1300.dtb \
 +	qcom-ipq4018-jalapeno.dtb \
 +	qcom-ipq4018-meshpoint-one.dtb \
 +	qcom-ipq4018-nbg6617.dtb \
@@ -53,6 +55,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4019-e2600ac-c2.dtb \
 +	qcom-ipq4019-habanero-dvk.dtb \
 +	qcom-ipq4019-pa2200.dtb \
++	qcom-ipq4019-r619ac-64m.dtb \
++	qcom-ipq4019-r619ac-128m.dtb \
++	qcom-ipq4019-l1000.dtb \
 +	qcom-ipq4019-rtl30vw.dtb \
 +	qcom-ipq4019-u4019-32m.dtb \
 +	qcom-ipq4019-wpj419.dtb \
@@ -64,9 +69,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4029-gl-b1300.dtb \
 +	qcom-ipq4029-gl-s1300.dtb \
 +	qcom-ipq4029-mr33.dtb \
-+	qcom-ipq4019-r619ac-64m.dtb \
-+	qcom-ipq4019-r619ac-128m.dtb \
-+	qcom-ipq4019-l1000.dtb \
  	qcom-ipq8064-ap148.dtb \
  	qcom-msm8660-surf.dtb \
  	qcom-msm8960-cdp.dtb \
\ No newline at end of file