mac80211: update ath10k to compat-wireless-2015-03-05
Also add some patches from OpenWrt trunk and use the CT ath10k firmware.
This commit is contained in:
Matthias Schiffer
parent
88da2fad44
commit
8aa65f1c2c
|
|
@ -15,5 +15,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT=y
|
|||
|
||||
CONFIG_ATH_USER_REGD=y
|
||||
CONFIG_PACKAGE_ATH_DEBUG=y
|
||||
CONFIG_ATH10K_CT_COMMUNITY_FW=y
|
||||
|
||||
CONFIG_PACKAGE_luci-base_srcdiet=y
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,41 @@
|
|||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Tue, 10 Mar 2015 13:17:06 +0100
|
||||
Subject: ath10k: update firmware to the latest version
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
|
||||
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
|
||||
index b96e782..629692d 100644
|
||||
--- a/package/kernel/mac80211/Makefile
|
||||
+++ b/package/kernel/mac80211/Makefile
|
||||
@@ -129,7 +129,7 @@ endef
|
||||
$(eval $(call Download,linux-firmware))
|
||||
|
||||
PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
|
||||
-PKG_ATH10K_LINUX_FIRMWARE_VERSION:=38eeda3ae6f90fde5546bdd48ee4ff3090f238c0
|
||||
+PKG_ATH10K_LINUX_FIRMWARE_VERSION:=232b419e71dab27b52b96e80ea7649ed67bdac77
|
||||
PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2
|
||||
PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git
|
||||
PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
|
||||
@@ -1821,18 +1821,17 @@ endef
|
||||
|
||||
define KernelPackage/ath10k/install
|
||||
$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
|
||||
-ifeq ($(CONFIG_ATH10K_STA_FW),y)
|
||||
$(INSTALL_DATA) \
|
||||
$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
|
||||
$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
|
||||
+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
|
||||
$(INSTALL_DATA) \
|
||||
- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
|
||||
- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/firmware-2.bin \
|
||||
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
|
||||
+ $(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
|
||||
endif
|
||||
endef
|
||||
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Tue, 10 Mar 2015 13:17:14 +0100
|
||||
Subject: ath10k: add Candelatech community firmware as an additional choice
|
||||
|
||||
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
|
||||
index 629692d..d77842a 100644
|
||||
--- a/package/kernel/mac80211/Makefile
|
||||
+++ b/package/kernel/mac80211/Makefile
|
||||
@@ -605,6 +605,14 @@ This module adds support for wireless adapters based on
|
||||
Atheros USB AR9271 and AR7010 family of chipsets.
|
||||
endef
|
||||
|
||||
+ATH10K_CT_COMMUNITY_FW:=firmware-2-ct-full-community-13.bin
|
||||
+define Download/ath10k-firmware-ct-community
|
||||
+ FILE:=$(ATH10K_CT_COMMUNITY_FW)
|
||||
+ URL:=http://www.candelatech.com/downloads/
|
||||
+ MD5SUM:=a3decc529b0171ae9ec4495089ab354a
|
||||
+endef
|
||||
+$(eval $(call Download,ath10k-firmware-ct-community))
|
||||
+
|
||||
define KernelPackage/ath10k
|
||||
$(call KernelPackage/mac80211/Default)
|
||||
TITLE:=Atheros 802.11ac wireless cards support
|
||||
@@ -625,13 +633,31 @@ endef
|
||||
define KernelPackage/ath10k/config
|
||||
if PACKAGE_kmod-ath10k
|
||||
|
||||
+ choice
|
||||
+ prompt "ath10k firmware flavour"
|
||||
+ default ATH10K_AP_FW
|
||||
+ help
|
||||
+ This option allows you to choose between different ath10k firmwares.
|
||||
+
|
||||
+ config ATH10K_AP_FW
|
||||
+ bool "Firmware optimized for AP operation"
|
||||
+ help
|
||||
+ Use the ath10k firmware optimized for access point operation.
|
||||
+ Supports only AP mode, will crash in IBSS (ad-hoc) mode.
|
||||
+
|
||||
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.
|
||||
+ of access point operation. Might be unstable in AP mode.
|
||||
+
|
||||
+ config ATH10K_CT_COMMUNITY_FW
|
||||
+ bool "Firmware by Candela Technologies (community version)"
|
||||
+ help
|
||||
+ Supports both AP and IBSS (ad-hoc) mode. Doesn't support
|
||||
+ encryption when using multiple VIFs.
|
||||
|
||||
+ endchoice
|
||||
endif
|
||||
endef
|
||||
|
||||
@@ -1824,14 +1850,20 @@ define KernelPackage/ath10k/install
|
||||
$(INSTALL_DATA) \
|
||||
$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
|
||||
$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
|
||||
+ifeq ($(CONFIG_ATH10K_AP_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
|
||||
+endif
|
||||
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
|
||||
+endif
|
||||
+ifeq ($(CONFIG_ATH10K_CT_COMMUNITY_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
|
||||
+ $(DL_DIR)/$(ATH10K_CT_COMMUNITY_FW) \
|
||||
+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
|
||||
endif
|
||||
endef
|
||||
|
||||
Reference in New Issue