aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/Makefile
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-09-05 19:43:38 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-09-05 19:43:38 +0000
commit11ae55cc957e0b51deacd9261a88bc5d7cc5ea9a (patch)
tree18a2950b032966df81fbfeb84ca62e8050baf6dc /package/kernel/mac80211/Makefile
parent14a65f1cfb19cd01df26cfafe036468ece40ea30 (diff)
downloadupstream-11ae55cc957e0b51deacd9261a88bc5d7cc5ea9a.tar.gz
upstream-11ae55cc957e0b51deacd9261a88bc5d7cc5ea9a.tar.bz2
upstream-11ae55cc957e0b51deacd9261a88bc5d7cc5ea9a.zip
mac80211: do not download carl9170 firmware separately, but use the one from linux-firemware
linux-firemware contains the same version we loaded without this patch. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 37901
Diffstat (limited to 'package/kernel/mac80211/Makefile')
-rw-r--r--package/kernel/mac80211/Makefile20
1 files changed, 5 insertions, 15 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 8a1fc4fd83..976fa6a168 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -45,8 +45,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_RTLWIFI_DEBUG \
CONFIG_ATH_USER_REGD \
-CARL9170_FW_VERSION:=1.9.6
-
include $(INCLUDE_DIR)/package.mk
WMENU:=Wireless Drivers
@@ -147,7 +145,6 @@ $(eval $(call Download,ath10k-firmware))
P54PCIFW:=2.13.12.0.arm
P54USBFW:=2.13.24.0.lm87.arm
P54SPIFW:=2.13.0.0.a.13.14.arm
-CARL9170_FW:=carl9170-1.fw
define Download/p54usb
FILE:=$(P54USBFW)
@@ -170,13 +167,6 @@ define Download/p54spi
endef
$(eval $(call Download,p54spi))
-define Download/carl9170
- FILE:=$(CARL9170_FW)-$(CARL9170_FW_VERSION)
- URL:=http://downloads.openwrt.org/sources/
- MD5SUM:=2fa6ed98d53d0b5fbcc136d1cf5e9609
-endef
-$(eval $(call Download,carl9170))
-
define KernelPackage/p54/Default
$(call KernelPackage/mac80211/Default)
TITLE:=Prism54 Drivers
@@ -609,11 +599,6 @@ define KernelPackage/carl9170
AUTOLOAD:=$(call AutoLoad,60,carl9170)
endef
-define KernelPackage/carl9170/install
- $(INSTALL_DIR) $(1)/lib/firmware
- $(INSTALL_DATA) $(DL_DIR)/$(CARL9170_FW)-$(CARL9170_FW_VERSION) $(1)/lib/firmware/$(CARL9170_FW)
-endef
-
define KernelPackage/lib80211
$(call KernelPackage/mac80211/Default)
TITLE:=802.11 Networking stack
@@ -1606,6 +1591,11 @@ define KernelPackage/zd1211rw/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211
endef
+define KernelPackage/carl9170/install
+ $(INSTALL_DIR) $(1)/lib/firmware
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/carl9170-1.fw $(1)/lib/firmware
+endef
+
define KernelPackage/ath9k-htc/install
$(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DATA) \