[OpenWrt-Devel] [PATCH v2 5/8] mac80211: make more ath10k firmwares selectable

[Günther Kelleter]

The ath10k firmware version is now a choice in the config menu. Added options for older firmware versions (10.1 and 10.2). It seems that recent firmware versions don't always run properly and this provides the option to select an older (more stable) version instead.

Signed-off-by: Günther Kelleter <guenther.kelleter at devolo.de>
---
 package/kernel/mac80211/Makefile | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index be26348..1182f14 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -624,13 +624,36 @@ endef
 define KernelPackage/ath10k/config
   if PACKAGE_kmod-ath10k
 
+	choice
+		prompt "ath10k Firmware version"
+		default ATH10K_API4_FW
+
 	config ATH10K_STA_FW
 		bool "Firmware optimized for STA operation"
-		default n
 		help
 		  Use the ath10k firmware optimized for wireless client instead
 		  of access point operation.
 
+	config ATH10K_API2_FW
+		bool "Firmware optimized for AP operation (v10.1 / API v2)"
+		help
+		  Use the ath10k firmware from the 10.1 SDK using API v2 optimized
+		  for access point operation
+
+	config ATH10K_API3_FW
+		bool "Firmware optimized for AP operation (v10.2 / API v3)"
+		help
+		  Use the ath10k firmware from the 10.2 SDK using API v3 optimized
+		  for access point operation
+
+	config ATH10K_API4_FW
+		bool "Firmware optimized for AP operation (v10.2.4 / API v4)"
+		help
+		  Use the ath10k firmware from the 10.2.4 SDK using API v4 optimized
+		  for access point operation
+
+	endchoice
+
   endif
 endef
 
@@ -1862,7 +1885,15 @@ ifeq ($(CONFIG_ATH10K_STA_FW),y)
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/main/firmware-2.bin_999.999.0.636 \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
-else
+else ifeq ($(CONFIG_ATH10K_API2_FW),y)
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.1/firmware-2.bin_10.1.467.2-1 \
+		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
+else ifeq ($(CONFIG_ATH10K_API3_FW),y)
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2/firmware-3.bin_10.2-00082-4-2 \
+		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-3.bin
+else ifeq ($(CONFIG_ATH10K_API4_FW),y)
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2.4/firmware-4.bin_10.2.4.45 \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-4.bin
-- 
2.4.4.88.gac2ab0d
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel