From af98e35d6e42d2b93c8e6538753c6bf03b57260b Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Thu, 4 Nov 2021 11:34:29 +0800
Subject: [PATCH] fix

---
 .../etc/hotplug.d/firmware/11-ath10k-caldata  | 17 -----
 .../base-files/lib/upgrade/platform.sh        |  9 ---
 root/target/linux/ipq40xx/image/generic.mk    | 73 -------------------
 3 files changed, 99 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 de85839d..73c4f091 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
@@ -46,13 +46,6 @@ case "$FIRMWARE" in
 		# OEM assigns 4 sequential MACs
 		ath10k_patch_mac $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
 		;;
-	netgear,srr60|\
-	netgear,srs60)
-		caldata_extract_mmc "0:ART" 0x9000 0x2f20
-		ath10k_patch_mac $(mmc_get_mac_binary ARTMTD 0x12)
-		;;
-	esac
-	;;
 "ath10k/pre-cal-ahb-a000000.wifi.bin")
 	case "$board" in
 	8dev,habanero-dvk |\
@@ -159,11 +152,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0x0)
 		;;
-	netgear,srr60|\
-	netgear,srs60)
-		caldata_extract_mmc "0:ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mmc_get_mac_binary ARTMTD 0x0)
-		;;
 	zyxel,nbg6617 |\
 	zyxel,wre6606)
 		caldata_extract "ART" 0x1000 0x2f20
@@ -283,11 +271,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0xc)
 		;;
-	netgear,srr60|\
-	netgear,srs60)
-		caldata_extract_mmc "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(mmc_get_mac_binary ARTMTD 0xc)
-		;;
 	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 6b9e831f..77466868 100644
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -115,15 +115,6 @@ platform_do_upgrade() {
 		CI_KERNPART="part.safe"
 		nand_do_upgrade "$1"
 		;;
-	mikrotik,hap-ac2|\
-	mikrotik,sxtsq-5-ac)
-		[ "$(rootfs_type)" = "tmpfs" ] && mtd erase firmware
-		default_do_upgrade "$1"
-		;;
-	netgear,srr60 |\
-	netgear,srs60)
-		platform_do_upgrade_netgear_orbi_upgrade "$1"
-		;;
 	openmesh,a42 |\
 	openmesh,a62 |\
 	plasmacloud,pa1200 |\
diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk
index daecd4cb..cc8eefec 100644
--- a/root/target/linux/ipq40xx/image/generic.mk
+++ b/root/target/linux/ipq40xx/image/generic.mk
@@ -664,79 +664,6 @@ define Device/netgear_ex6150v2
 endef
 TARGET_DEVICES += netgear_ex6150v2
 
-define Device/netgear_orbi
-	$(call Device/DniImage)
-	SOC := qcom-ipq4019
-	DEVICE_VENDOR := NETGEAR
-	IMAGE/factory.img := append-kernel | pad-offset 128k 64 | \
-		append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | \
-		append-rootfs | pad-rootfs | netgear-dni
-	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | \
-		sysupgrade-tar rootfs=$$$$@ | append-metadata
-	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs kmod-fs-ext4 losetup
-endef
-
-define Device/netgear_rbx50
-	$(call Device/netgear_orbi)
-	NETGEAR_HW_ID := 29765352+0+4000+512+2x2+2x2+4x4
-	KERNEL_SIZE := 3932160
-	ROOTFS_SIZE := 32243712
-	IMAGE_SIZE := 36175872
-endef
-
-define Device/netgear_rbr50
-	$(call Device/netgear_rbx50)
-	DEVICE_MODEL := RBR50
-	DEVICE_VARIANT := v1
-	NETGEAR_BOARD_ID := RBR50
-endef
-TARGET_DEVICES += netgear_rbr50
-
-define Device/netgear_rbs50
-	$(call Device/netgear_rbx50)
-	DEVICE_MODEL := RBS50
-	DEVICE_VARIANT := v1
-	NETGEAR_BOARD_ID := RBS50
-endef
-TARGET_DEVICES += netgear_rbs50
-
-define Device/netgear_srx60
-	$(call Device/netgear_orbi)
-	NETGEAR_HW_ID := 29765352+0+4096+512+2x2+2x2+4x4
-	KERNEL_SIZE := 3932160
-	ROOTFS_SIZE := 32243712
-	IMAGE_SIZE := 36175872
-endef
-
-define Device/netgear_srr60
-	$(call Device/netgear_srx60)
-	DEVICE_MODEL := SRR60
-	NETGEAR_BOARD_ID := SRR60
-endef
-TARGET_DEVICES += netgear_srr60
-
-define Device/netgear_srs60
-	$(call Device/netgear_srx60)
-	DEVICE_MODEL := SRS60
-	NETGEAR_BOARD_ID := SRS60
-endef
-TARGET_DEVICES += netgear_srs60
-
-define Device/netgear_wac510
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := Netgear
-	DEVICE_MODEL := WAC510
-	SOC := qcom-ipq4018
-	DEVICE_DTS_CONFIG := config@5
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	IMAGES += nand-factory.tar
-	IMAGE/nand-factory.tar := append-ubi | wac5xx-netgear-tar
-	DEVICE_PACKAGES := uboot-envtools
-endef
-TARGET_DEVICES += netgear_wac510
-
 define Device/openmesh_a42
 	$(call Device/FitImageLzma)
 	DEVICE_VENDOR := OpenMesh