From 95229f5b9f21282f236137b9c0c3ed2811cd2243 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Thu, 4 Nov 2021 01:54:01 +0800
Subject: [PATCH] fix

---
 .../linux/ipq40xx/base-files/etc/board.d/02_network      | 1 -
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 8 --------
 .../linux/ipq40xx/base-files/lib/upgrade/platform.sh     | 1 -
 root/target/linux/ipq40xx/image/generic.mk               | 9 ---------
 .../ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | 3 +--
 5 files changed, 1 insertion(+), 21 deletions(-)

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 89fc3448..c34ed5c5 100644
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -17,7 +17,6 @@ ipq40xx_setup_interfaces()
 	engenius,emr3500|\
 	engenius,ens620ext|\
 	luma,wrtq-329acn|\
-	netgear,wac510|\
 	plasmacloud,pa1200|\
 	plasmacloud,pa2200)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
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 2a4b0a39..74d24f33 100644
--- 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
@@ -168,10 +168,6 @@ case "$FIRMWARE" in
 		caldata_extract_mmc "0:ART" 0x1000 0x2f20
 		ath10k_patch_mac $(mmc_get_mac_binary ARTMTD 0x0)
 		;;
-	netgear,wac510)
-		caldata_extract "0:ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary "0:MANUDATA" 0x6)
-		;;
 	zyxel,nbg6617 |\
 	zyxel,wre6606)
 		caldata_extract "ART" 0x1000 0x2f20
@@ -298,10 +294,6 @@ case "$FIRMWARE" in
 		caldata_extract_mmc "0:ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mmc_get_mac_binary ARTMTD 0xc)
 		;;
-	netgear,wac510)
-		caldata_extract "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:MANUDATA" 0x6) 16)
-		;;
 	zyxel,nbg6617 |\
 	zyxel,wre6606)
 		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 1d5c5f62..9952d5da 100644
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -74,7 +74,6 @@ platform_do_upgrade() {
 	luma,wrtq-329acn |\
 	zbt,z4019 |\
 	mobipromo,cm520-79f |\
-	netgear,wac510 |\
 	p2w,r619ac-64m |\
  	p2w,r619ac-128m |\
 	qxwlan,e2600ac-c2)
diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk
index 1629fde6..daecd4cb 100644
--- a/root/target/linux/ipq40xx/image/generic.mk
+++ b/root/target/linux/ipq40xx/image/generic.mk
@@ -62,15 +62,6 @@ define Build/mkmylofw_32m
 	@mv $@.new $@
 endef
 
-define Build/wac5xx-netgear-tar
-	mkdir $@.tmp
-	mv $@ $@.tmp/wac5xx-ubifs-root.img
-	md5sum $@.tmp/wac5xx-ubifs-root.img > $@.tmp/wac5xx-ubifs-root.md5sum
-	echo "WAC505 WAC510" > $@.tmp/metadata.txt
-	echo "WAC505_V9.9.9.9" > $@.tmp/version
-	tar -C $@.tmp/ -cf $@ .
-	rm -rf $@.tmp
-endef
 
 define Build/qsdk-ipq-factory-nand-askey
 	$(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh $@.its\
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 b4374613..8c258f40 100644
--- 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,67 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,66 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -37,7 +37,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4019-oap100.dtb \
 +	qcom-ipq4018-pa1200.dtb \
 +	qcom-ipq4018-rt-ac58u.dtb \
-+	qcom-ipq4018-wac510.dtb \
 +	qcom-ipq4018-wre6606.dtb \
 +	qcom-ipq4018-wrtq-329acn.dtb \
  	qcom-ipq4019-ap.dk01.1-c1.dtb \