Changeset 37901


Ignore:
Timestamp:
2013-09-05T21:43:38+02:00 (4 years ago)
Author:
hauke
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/Makefile

    r37898 r37901  
    4646        CONFIG_ATH_USER_REGD \ 
    4747 
    48 CARL9170_FW_VERSION:=1.9.6 
    49  
    5048include $(INCLUDE_DIR)/package.mk 
    5149 
     
    148146P54USBFW:=2.13.24.0.lm87.arm 
    149147P54SPIFW:=2.13.0.0.a.13.14.arm 
    150 CARL9170_FW:=carl9170-1.fw 
    151148 
    152149define Download/p54usb 
     
    170167endef 
    171168$(eval $(call Download,p54spi)) 
    172  
    173 define Download/carl9170 
    174   FILE:=$(CARL9170_FW)-$(CARL9170_FW_VERSION) 
    175   URL:=http://downloads.openwrt.org/sources/ 
    176   MD5SUM:=2fa6ed98d53d0b5fbcc136d1cf5e9609 
    177 endef 
    178 $(eval $(call Download,carl9170)) 
    179169 
    180170define KernelPackage/p54/Default 
     
    608598  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko 
    609599  AUTOLOAD:=$(call AutoLoad,60,carl9170) 
    610 endef 
    611  
    612 define KernelPackage/carl9170/install 
    613         $(INSTALL_DIR) $(1)/lib/firmware 
    614         $(INSTALL_DATA) $(DL_DIR)/$(CARL9170_FW)-$(CARL9170_FW_VERSION) $(1)/lib/firmware/$(CARL9170_FW) 
    615600endef 
    616601 
     
    16051590        $(INSTALL_DIR) $(1)/lib/firmware/zd1211 
    16061591        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 
     1592endef 
     1593 
     1594define KernelPackage/carl9170/install 
     1595        $(INSTALL_DIR) $(1)/lib/firmware 
     1596        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/carl9170-1.fw $(1)/lib/firmware 
    16071597endef 
    16081598 
Note: See TracChangeset for help on using the changeset viewer.