From 80a6b0a9173a1182081e184fd0f22c0996bd16b2 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@gmail.com>
Date: Tue, 4 Jul 2023 20:42:22 +0200
Subject: [PATCH] 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.

qca9984 isn't affected.

Fixes: #12886
Reported-by: Christian Heuff <christian@heuff.at>
Debugged-by: Georgios Kourachanis <geo.kourachanis@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit 75505c5ec724b9b961dcb411bac1d4b9aede3e1d)
---
 package/firmware/ipq-wifi/Makefile              |   9 ++++++---
 .../firmware/ipq-wifi/board-zte_mf289f.qca4019  | Bin 0 -> 24308 bytes
 target/linux/ipq40xx/image/generic.mk           |   2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 package/firmware/ipq-wifi/board-zte_mf289f.qca4019

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index d5ffd2084e..4ccf05af8d 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_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
@@ -24,7 +24,8 @@ endef
 # You can find instructions and examples on the linux-wireless wiki:
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
-ALLWIFIBOARDS:=
+ALLWIFIBOARDS:= \
+	zte_mf289f
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
 
@@ -85,4 +86,6 @@ endef
 # Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 
-#$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
+$(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F))
+
+$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/package/firmware/ipq-wifi/board-zte_mf289f.qca4019 b/package/firmware/ipq-wifi/board-zte_mf289f.qca4019
new file mode 100644
index 0000000000000000000000000000000000000000..3a4cb8b888cc7e7282b064fce2c0d6e48f562702
GIT binary patch
literal 24308
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

literal 0
HcmV?d00001

diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 9dfa877c32..b8e3edf857 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -1003,7 +1003,7 @@ TARGET_DEVICES += zte_mf286d
 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
 
-- 
2.30.2