From: Robert Marko Date: Tue, 30 Nov 2021 09:25:52 +0000 (+0100) Subject: ipq-wifi: remove packaged BDF-s for MikroTik devices X-Git-Tag: v22.03.0-rc5~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e38bd13537a79afe79e81235da9469fe190551b;p=thirdparty%2Fopenwrt.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 (cherry picked from commit ab141a6e2cb645ff64adb107af2e8973a720c1c7) Signed-off-by: Thibaut VARÈNE --- diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index d3a3e319f9e..496d564baf8 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -46,10 +46,6 @@ ALLWIFIBOARDS:= \ linksys_ea8300 \ linksys_mr8300-v0 \ luma_wrtq-329acn \ - mikrotik_cap-ac \ - mikrotik_hap-ac2 \ - mikrotik_hap-ac3 \ - mikrotik_sxtsq-5-ac \ mobipromo_cm520-79f \ nec_wg2600hp3 \ p2w_r619ac \ @@ -140,10 +136,6 @@ $(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,linksys_mr8300-v0,Linksys MR8300)) $(eval $(call generate-ipq-wifi-package,luma_wrtq-329acn,Luma WRTQ-329ACN)) -$(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,mobipromo_cm520-79f,MobiPromo CM520-79F)) $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3)) $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC)) 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 81da65d2257..00000000000 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 73372c183e1..00000000000 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 a97a20217c5..00000000000 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 97f982637a8..00000000000 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 037a0428487..b2e8428e942 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