[openwrt/openwrt] ipq-wifi: fix upstream board-2.bin ZTE M289F snafu

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/894b2086fdf91409980df99ffe6ab8808de0302d

commit 894b2086fdf91409980df99ffe6ab8808de0302d
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Tue Jul 4 20:42:22 2023 +0200

    ipq-wifi: fix upstream board-2.bin ZTE M289F snafu
    
    The upstream board-2.bin file in the linux-firmware.git
    repository for the QCA4019 contains a packed board-2.bin
    for this device for both 2.4G and 5G wifis. This isn't
    something that the ath10k driver supports.
    
    Until this feature either gets implemented - which is
    very unlikely -, or the upstream boardfile is mended
    (both, the original submitter and ath10k-firmware
    custodian have been notified). OpenWrt will go back
    and use its own bespoke boardfile. This unfortunately
    means that 2.4G and on some revisions the 5G WiFi is
    not available in the initramfs image for this device.
    
    Fixes: #12886
    Reported-by: Christian Heuff <christian at heuff.at>
    Debugged-by: Georgios Kourachanis <geo.kourachanis at gmail.com>
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
    (cherry picked from commit 75505c5ec724b9b961dcb411bac1d4b9aede3e1d)
---
 package/firmware/ipq-wifi/Makefile    | 4 +++-
 target/linux/ipq40xx/image/generic.mk | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index faee191c34..8936a1dd60 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=ipq-wifi
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
@@ -40,6 +40,7 @@ ALLWIFIBOARDS:= \
 	wallys_dr40x9 \
 	xiaomi_ax3600 \
 	xiaomi_ax9000 \
+	zte_mf289f \
 	zte_mf287plus \
 	zyxel_nbg7815
 
@@ -127,6 +128,7 @@ $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
 $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
+$(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F))
 $(eval $(call generate-ipq-wifi-package,zte_mf287plus,ZTE MF287Plus))
 $(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815))
 
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index b9e9e478d9..f15463ae8c 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -1169,7 +1169,7 @@ TARGET_DEVICES += zte_mf287plus
 define Device/zte_mf289f
 	$(call Device/zte_mf28x_common)
 	DEVICE_MODEL := MF289F
-	DEVICE_PACKAGES += ath10k-firmware-qca9984-ct
+	DEVICE_PACKAGES += ipq-wifi-zte_mf289f ath10k-firmware-qca9984-ct
 endef
 TARGET_DEVICES += zte_mf289f