From: Robert Marko <robimarko@gmail.com>
Date: Tue, 30 Nov 2021 09:25:52 +0000 (+0100)
Subject: ipq-wifi: remove packaged BDF-s for MikroTik devices
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ab141a6e2cb645ff64adb107af2e8973a720c1c7;p=openwrt%2Fstaging%2Fjogo.git

ipq-wifi: remove packaged BDF-s for MikroTik devices

Since we now provide the BDF-s for MikroTik IPQ40xx devices on the fly,
there is noneed to include package and ship them like we do now.

This also resolves the performance issues that happen as MikroTik
changes the boards and ships them under the same revision but they
actually ship with and require a different BDF.

Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 732fc5ee47..cd155473bb 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -32,10 +32,6 @@ ALLWIFIBOARDS:= \
 	glinet_gl-b2200 \
 	glinet_gl-s1300 \
 	linksys_ea8300 \
-	mikrotik_cap-ac \
-	mikrotik_hap-ac2 \
-	mikrotik_hap-ac3 \
-	mikrotik_sxtsq-5-ac \
 	p2w_r619ac \
 	qxwlan_e2600ac-c1 \
 	qxwlan_e2600ac-c2 \
@@ -107,10 +103,6 @@ $(eval $(call generate-ipq-wifi-package,glinet_gl-ap1300,GL.iNet GL-AP1300))
 $(eval $(call generate-ipq-wifi-package,glinet_gl-b2200,GL.iNet GL-B2200))
 $(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300))
 $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
-$(eval $(call generate-ipq-wifi-package,mikrotik_cap-ac,Mikrotik cAP ac))
-$(eval $(call generate-ipq-wifi-package,mikrotik_hap-ac2,Mikrotik hAP ac2))
-$(eval $(call generate-ipq-wifi-package,mikrotik_hap-ac3,Mikrotik hAP ac3))
-$(eval $(call generate-ipq-wifi-package,mikrotik_sxtsq-5-ac,MikroTik SXTsq 5 ac))
 $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c1,Qxwlan E2600AC C1))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c2,Qxwlan E2600AC C2))
diff --git a/package/firmware/ipq-wifi/board-mikrotik_cap-ac.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_cap-ac.qca4019
deleted file mode 100644
index 81da65d225..0000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_cap-ac.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019
deleted file mode 100644
index 73372c183e..0000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_hap-ac2.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mikrotik_hap-ac3.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_hap-ac3.qca4019
deleted file mode 100644
index a97a20217c..0000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_hap-ac3.qca4019 and /dev/null differ
diff --git a/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019 b/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019
deleted file mode 100644
index 97f982637a..0000000000
Binary files a/package/firmware/ipq-wifi/board-mikrotik_sxtsq-5-ac.qca4019 and /dev/null differ
diff --git a/target/linux/ipq40xx/image/mikrotik.mk b/target/linux/ipq40xx/image/mikrotik.mk
index 037a042848..b2e8428e94 100644
--- a/target/linux/ipq40xx/image/mikrotik.mk
+++ b/target/linux/ipq40xx/image/mikrotik.mk
@@ -24,8 +24,7 @@ define Device/mikrotik_cap-ac
 	$(call Device/mikrotik_nor)
 	DEVICE_MODEL := cAP ac
 	SOC := qcom-ipq4018
-	DEVICE_PACKAGES := ipq-wifi-mikrotik_cap-ac -kmod-ath10k-ct \
-		kmod-ath10k-ct-smallbuffers
+	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += mikrotik_cap-ac
 
@@ -33,8 +32,7 @@ define Device/mikrotik_hap-ac2
 	$(call Device/mikrotik_nor)
 	DEVICE_MODEL := hAP ac2
 	SOC := qcom-ipq4018
-	DEVICE_PACKAGES := ipq-wifi-mikrotik_hap-ac2 -kmod-ath10k-ct \
-		kmod-ath10k-ct-smallbuffers
+	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += mikrotik_hap-ac2
 
@@ -45,7 +43,7 @@ define Device/mikrotik_hap-ac3
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	KERNEL_UBIFS_OPTS = -m $$(PAGESIZE) -e 124KiB -c $$(PAGESIZE) -x none
-	DEVICE_PACKAGES := kmod-ledtrig-gpio ipq-wifi-mikrotik_hap-ac3
+	DEVICE_PACKAGES := kmod-ledtrig-gpio
 endef
 TARGET_DEVICES += mikrotik_hap-ac3
 
@@ -61,6 +59,6 @@ define Device/mikrotik_sxtsq-5-ac
 	$(call Device/mikrotik_nor)
 	DEVICE_MODEL := SXTsq 5 ac (RBSXTsqG-5acD)
 	SOC := qcom-ipq4018
-	DEVICE_PACKAGES := ipq-wifi-mikrotik_sxtsq-5-ac rssileds
+	DEVICE_PACKAGES := rssileds
 endef
 TARGET_DEVICES += mikrotik_sxtsq-5-ac