From 80a6b0a9173a1182081e184fd0f22c0996bd16b2 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Tue, 4 Jul 2023 20:42:22 +0200 Subject: 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 Debugged-by: Georgios Kourachanis Signed-off-by: Christian Lamparter (cherry picked from commit 75505c5ec724b9b961dcb411bac1d4b9aede3e1d) --- package/firmware/ipq-wifi/Makefile | 9 ++++++--- package/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: # -ALLWIFIBOARDS:= +ALLWIFIBOARDS:= \ + zte_mf289f ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) @@ -85,4 +86,6 @@ endef # Place files in this directory as board-. # Add $(eval $(call generate-ipq-wifi-package,,)) -#$(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 0000000000..3a4cb8b888 Binary files /dev/null and b/package/firmware/ipq-wifi/board-zte_mf289f.qca4019 differ 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 -- cgit v1.2.3