aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-10-30 22:01:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-10-30 22:01:18 +0000
commit3fd8621f623b061ede340909ccba504b2828908d (patch)
tree731b20ebf043fe2f9796d5a209e3f7327d1cc003 /package
parenteda1b3a3f63be4bdf1e8d3c08781dcc5f1ab9a3b (diff)
downloadupstream-3fd8621f623b061ede340909ccba504b2828908d.tar.gz
upstream-3fd8621f623b061ede340909ccba504b2828908d.tar.bz2
upstream-3fd8621f623b061ede340909ccba504b2828908d.zip
ath10k: split out ath10k firmware into a separate source package and .ipk
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 47294
Diffstat (limited to 'package')
-rw-r--r--package/firmware/ath10k-firmware/Makefile50
-rw-r--r--package/kernel/mac80211/Makefile30
2 files changed, 50 insertions, 30 deletions
diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
new file mode 100644
index 0000000000..bce0f80639
--- /dev/null
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ath10k-firmware
+PKG_SOURCE_VERSION:=7d14e337ad25c0ef3e78fc47eac336697ca612e8
+PKG_VERSION:=2014-10-28-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+WMENU:=Wireless Drivers
+
+define Package/ath10k-firmware-qca988x
+ SECTION:=kernel
+ CATEGORY:=Kernel modules
+ SUBMENU:=$(WMENU)
+ URL:=$(PKG_SOURCE_URL)
+ DEFAULT:=PACKAGE_kmod-ath10k
+ DEPENDS:=kmod-ath10k
+ TITLE:=ath10k firmware for QCA988x devices
+endef
+
+define Build/Compile
+
+endef
+
+define Package/ath10k-firmware-qca988x/install
+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
+ $(INSTALL_DATA) \
+ $(PKG_BUILD_DIR)/ath10k/QCA988X/hw2.0/board.bin \
+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
+ $(INSTALL_DATA) \
+ $(PKG_BUILD_DIR)/QCA988X/10.2.4/firmware-5.bin_10.2.4.70-2 \
+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
+endef
+
+$(eval $(call BuildPackage,ath10k-firmware-qca988x))
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index f6050c4e2b..580b2c3b6f 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -270,25 +270,6 @@ Atheros IEEE 802.11ac family of chipsets. For now only
PCI is supported.
endef
-PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
-PKG_ATH10K_LINUX_FIRMWARE_VERSION:=b46f3e01a6c1f9150fb4612ef53611d714565842
-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
-PKG_ATH10K_LINUX_FIRMWARE_SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
-#PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM:=?
-
-define Download/ath10k-firmware
- FILE:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE)
- URL:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL)
- PROTO:=$(PKG_ATH10K_LINUX_FIRMWARE_PROTO)
- VERSION:=$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
- SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)
- #MIRROR_MD5SUM:=$(PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM)
-endef
-$(eval $(call Download,ath10k-firmware))
-
-
#Broadcom firmware
ifneq ($(CONFIG_B43_FW_6_30),)
PKG_B43_FWV4_NAME:=broadcom-wl
@@ -1789,7 +1770,6 @@ define Build/Prepare
$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
$(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
$(TAR) -C $(PKG_BUILD_DIR) -xJf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE)
- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE)
$(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_MT7601U_FW_SOURCE)
rm -rf \
$(PKG_BUILD_DIR)/include/linux/ssb \
@@ -1849,16 +1829,6 @@ define KernelPackage/ath9k-htc/install
$(1)/lib/firmware/
endef
-define KernelPackage/ath10k/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- $(INSTALL_DATA) \
- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
- $(INSTALL_DATA) \
- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2.4/untested/firmware-5.bin_10.2.4.70-2 \
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-endef
-
define KernelPackage/b43/install
rm -rf $(1)/lib/firmware/
ifeq ($(CONFIG_B43_OPENFIRMWARE),y)