ipq-wifi: drop upstreamed custom board-2.bin

The BDFs for the:
	ALFA Network AP120C-AC
	ASUS Lyra
	AVM FRITZ!Box 7530
	AVM FRITZ!Repeater 3000
	EnGenius EAP1300
	EnGenius ENS620EXT
	Netgear Orbi Pro SRK60

boards were upstreamed to the ath10k-firmware repository
and linux-firmware.git.

Furthermore the BDFs for the:
	OpenMesh A42 specific BDFs
	OpenMesh A62 specific BDFs
	Linksys EA6350v3
have been updated.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

10 files changed, 4 insertions, 21 deletions

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 922064b7f7..c90c0be990 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -24,13 +24,6 @@ endef
 #
 
 ALLWIFIBOARDS:= \
-	alfa-network_ap120c-ac \
-	asus_map-ac2200 \
-	avm_fritzbox-7530 \
-	avm_fritzrepeater-3000 \
-	engenius_eap1300 \
-	engenius_ens620ext \
-	linksys_ea6350v3 \
 	linksys_ea8300 \
 	qxwlan_e2600ac
 
@@ -95,13 +88,6 @@ endef
 # Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 
-$(eval $(call generate-ipq-wifi-package,alfa-network_ap120c-ac,ALFA Network AP120C-AC))
-$(eval $(call generate-ipq-wifi-package,asus_map-ac2200,ASUS MAP-AC2200))
-$(eval $(call generate-ipq-wifi-package,avm_fritzbox-7530,AVM FRITZ!Box 7530))
-$(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-3000,AVM FRITZ!Repeater 3000))
-$(eval $(call generate-ipq-wifi-package,engenius_eap1300,EnGenius EAP1300))
-$(eval $(call generate-ipq-wifi-package,engenius_ens620ext,EnGenius ENS620EXT))
-$(eval $(call generate-ipq-wifi-package,linksys_ea6350v3,Linksys EA6350v3))
 $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 
diff --git a/package/firmware/ipq-wifi/board-alfa-network_ap120c-ac.bin b/package/firmware/ipq-wifi/board-alfa-network_ap120c-ac.bin
deleted file mode 100644
index 4ce1321a0a..0000000000
--- a/package/firmware/ipq-wifi/board-alfa-network_ap120c-ac.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-asus_map-ac2200.bin b/package/firmware/ipq-wifi/board-asus_map-ac2200.bin
deleted file mode 120000
index d6e8b35b11..0000000000
--- a/package/firmware/ipq-wifi/board-asus_map-ac2200.bin
+++ /dev/null
@@ -1 +0,0 @@
-board-map-ac2200.bin
\ No newline at end of file
diff --git a/package/firmware/ipq-wifi/board-avm_fritzbox-7530.bin b/package/firmware/ipq-wifi/board-avm_fritzbox-7530.bin
deleted file mode 100644
index 905145f1da..0000000000
--- a/package/firmware/ipq-wifi/board-avm_fritzbox-7530.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-avm_fritzrepeater-3000.bin b/package/firmware/ipq-wifi/board-avm_fritzrepeater-3000.bin
deleted file mode 100644
index 69e40a1e7a..0000000000
--- a/package/firmware/ipq-wifi/board-avm_fritzrepeater-3000.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-engenius_eap1300.bin b/package/firmware/ipq-wifi/board-engenius_eap1300.bin
deleted file mode 100644
index eb4328cd95..0000000000
--- a/package/firmware/ipq-wifi/board-engenius_eap1300.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-engenius_ens620ext.bin b/package/firmware/ipq-wifi/board-engenius_ens620ext.bin
deleted file mode 100644
index 54fd1d0a3d..0000000000
--- a/package/firmware/ipq-wifi/board-engenius_ens620ext.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-linksys_ea6350v3.bin b/package/firmware/ipq-wifi/board-linksys_ea6350v3.bin
deleted file mode 100644
index 7e5c212e47..0000000000
--- a/package/firmware/ipq-wifi/board-linksys_ea6350v3.bin
+++ /dev/null
diff --git a/package/firmware/ipq-wifi/board-map-ac2200.bin b/package/firmware/ipq-wifi/board-map-ac2200.bin
deleted file mode 100644
index 372936010a..0000000000
--- a/package/firmware/ipq-wifi/board-map-ac2200.bin
+++ /dev/null
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index 567f91d4d7..0070db65c5 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -93,7 +93,7 @@ define Device/asus_map-ac2200
 	DEVICE_MODEL := Lyra (MAP-AC2200)
 	DEVICE_DTS := qcom-ipq4019-map-ac2200
 	IMAGES := sysupgrade.bin
-	DEVICE_PACKAGES := ipq-wifi-asus_map-ac2200 ath10k-firmware-qca9888-ct kmod-ath3k
+	DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k
 endef
 TARGET_DEVICES += asus_map-ac2200
 
@@ -139,7 +139,7 @@ define Device/avm_fritzbox-7530
 	DEVICE_VENDOR := AVM
 	DEVICE_MODEL := FRITZ!Box 7530
 	DEVICE_DTS := qcom-ipq4019-fritzbox-7530
-	DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand ipq-wifi-avm_fritzbox-7530
+	DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand
 	IMAGES := sysupgrade.bin
 endef
 TARGET_DEVICES += avm_fritzbox-7530
@@ -149,7 +149,7 @@ define Device/avm_fritzrepeater-3000
 	DEVICE_VENDOR := AVM
 	DEVICE_MODEL := FRITZ!Repeater 3000
 	DEVICE_DTS := qcom-ipq4019-fritzrepeater-3000
-	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct fritz-caldata fritz-tffs-nand ipq-wifi-avm_fritzrepeater-3000
+	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct fritz-caldata fritz-tffs-nand
 	IMAGES := sysupgrade.bin
 endef
 TARGET_DEVICES += avm_fritzrepeater-3000
@@ -180,7 +180,6 @@ define Device/engenius_eap1300
 	IMAGE_SIZE := 25344k
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
-	DEVICE_PACKAGES := ipq-wifi-engenius_eap1300
 endef
 TARGET_DEVICES += engenius_eap1300
 
@@ -207,7 +206,6 @@ define Device/engenius_ens620ext
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | append-metadata
 	IMAGE/factory_30.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | SenaoFW $$$$(PRODUCT_ID) $$$$(FW_VER)
 	IMAGE/factory_35.bin := qsdk-ipq-factory-nor | check-size $$$$(IMAGE_SIZE) | SenaoFW $$$$(PRODUCT_ID_NEW) $$$$(FW_VER_NEW)
-	DEVICE_PACKAGES := ipq-wifi-engenius_ens620ext
 endef
 TARGET_DEVICES += engenius_ens620ext
 
@@ -257,7 +255,7 @@ define Device/linksys_ea6350v3
 	UBINIZE_OPTS := -E 5
 	IMAGES := factory.bin sysupgrade.bin
 	IMAGE/factory.bin := append-kernel | append-uImage-fakehdr filesystem | pad-to $$$${KERNEL_SIZE} | append-ubi | linksys-image type=EA6350v3
-	DEVICE_PACKAGES := ipq-wifi-linksys_ea6350v3 uboot-envtools
+	DEVICE_PACKAGES := uboot-envtools
 endef
 TARGET_DEVICES += linksys_ea6350v3