Changeset 22121


Ignore:
Timestamp:
2010-07-11T02:26:32+02:00 (7 years ago)
Author:
nico
Message:

[backfire] merge r21572

package/carl9170: update to 1.0.5.3 (closes: #7342), make DebugFS support configurable and add LEDs support

Location:
branches/backfire/package/carl9170
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/carl9170/Makefile

    r19691 r22121  
    1010 
    1111PKG_NAME:=carl9170 
    12 PKG_VERSION:=1.0.1.1 
     12PKG_VERSION:=1.0.5.3 
    1313PKG_RELEASE:=1 
    1414 
     
    1616PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \ 
    1717        @KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION) 
    18 PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8 
     18PKG_MD5SUM:=91d714d1e5c5c62da1191ac5afd8bcb0 
     19 
     20PKG_CONFIG_DEPENDS:= \ 
     21        CONFIG_PACKAGE_CARL9170_DEBUGFS \ 
    1922 
    2023include $(INCLUDE_DIR)/package.mk 
     
    2932  FILES:=$(DRV_PATH)/carl9170usb.$(LINUX_KMOD_SUFFIX) 
    3033  AUTOLOAD:=$(call AutoLoad,60,carl9170usb) 
     34  MENU:=1 
     35endef 
     36 
     37define KernelPackage/carl9170/config 
     38        menu "Configuration" 
     39                depends PACKAGE_kmod-carl9170 
     40 
     41        config PACKAGE_CARL9170_DEBUGFS 
     42                bool "Enable Debugging (DebugFS) Support" 
     43                depends PACKAGE_MAC80211_DEBUGFS 
     44                help 
     45                  Say Y if you need access to carl9170usb's statistics for QoS queue  
     46                  status, rate control, etc... 
     47 
     48        endmenu 
    3149endef 
    3250 
     
    4058        $(HOST_TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_SOURCE) 
    4159        $(HOST_TAR) -C $(PKG_BUILD_DIR) -xf $(PKG_BUILD_DIR)/$(PKG_VERSION)/driver/carl9170-driver-$(PKG_VERSION).tar 
    42         ln -sf Makefile.standalone $(DRV_PATH)/Makefile 
    4360        ln -s $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ 
    4461        $(Build/Patch) 
     
    4663 
    4764BUILDFLAGS = \ 
    48         CONFIG_MAC80211_DEBUGFS=$(CONFIG_PACKAGE_MAC80211_DEBUGFS) 
     65        CONFIG_CARL9170_USB=m \ 
     66        CONFIG_CARL9170_LEDS=$(if $(CONFIG_LEDS_TRIGGERS),y) \ 
     67        CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),y) \ 
     68        CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ 
    4969 
    5070EXTRA_CFLAGS = \ 
    51         $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD) 
     71        $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD) \ 
     72        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_CARL9170_LEDS) \ 
     73        $(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),-DCONFIG_CARL9170_DEBUGFS) \ 
     74        $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS) \ 
    5275 
    5376define Build/Compile 
     
    6285define KernelPackage/carl9170/install 
    6386        $(INSTALL_DIR) $(1)/lib/firmware 
    64         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_VERSION)/firmware_build/carl9170.fw $(1)/lib/firmware/ 
     87        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_VERSION)/firmware_build/carl9170-1.fw $(1)/lib/firmware/ 
    6588endef 
    6689 
  • branches/backfire/package/carl9170/patches/100-request_firmware_compat.patch

    r20456 r22121  
    11--- a/drivers/net/wireless/ath/carl9170/usb.c 
    22+++ b/drivers/net/wireless/ath/carl9170/usb.c 
    3 @@ -988,11 +988,28 @@ err_failed: 
     3@@ -1000,11 +1000,28 @@ err_failed: 
    44        ar9170_usb_firmware_failed(aru); 
    55 } 
Note: See TracChangeset for help on using the changeset viewer.