From e583494eca8890681218b3b5ca00d61a35d153e2 Mon Sep 17 00:00:00 2001 From: Nicolas Thill <nico@openwrt.org> Date: Wed, 26 May 2010 14:25:17 +0000 Subject: package/carl9170: update to 1.0.5.3 (closes: #7342), make DebugFS support configurable and add LEDs support SVN-Revision: 21572 --- package/carl9170/Makefile | 35 ++++++++++++++++++---- .../patches/100-request_firmware_compat.patch | 2 +- package/carl9170/patches/120-compile_fix.patch | 13 -------- 3 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 package/carl9170/patches/120-compile_fix.patch (limited to 'package') diff --git a/package/carl9170/Makefile b/package/carl9170/Makefile index 8238389867..34165cb48e 100644 --- a/package/carl9170/Makefile +++ b/package/carl9170/Makefile @@ -9,13 +9,16 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=carl9170 -PKG_VERSION:=1.0.1.1 +PKG_VERSION:=1.0.5.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \ @KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION) -PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8 +PKG_MD5SUM:=91d714d1e5c5c62da1191ac5afd8bcb0 + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_CARL9170_DEBUGFS \ include $(INCLUDE_DIR)/package.mk @@ -28,6 +31,21 @@ define KernelPackage/carl9170 URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170 FILES:=$(DRV_PATH)/carl9170usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,carl9170usb) + MENU:=1 +endef + +define KernelPackage/carl9170/config + menu "Configuration" + depends PACKAGE_kmod-carl9170 + + config PACKAGE_CARL9170_DEBUGFS + bool "Enable Debugging (DebugFS) Support" + depends PACKAGE_MAC80211_DEBUGFS + help + Say Y if you need access to carl9170usb's statistics for QoS queue + status, rate control, etc... + + endmenu endef define KernelPackage/carl9170/description @@ -39,16 +57,21 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(HOST_TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_SOURCE) $(HOST_TAR) -C $(PKG_BUILD_DIR) -xf $(PKG_BUILD_DIR)/$(PKG_VERSION)/driver/carl9170-driver-$(PKG_VERSION).tar - ln -sf Makefile.standalone $(DRV_PATH)/Makefile ln -s $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ $(Build/Patch) endef BUILDFLAGS = \ - CONFIG_MAC80211_DEBUGFS=$(CONFIG_PACKAGE_MAC80211_DEBUGFS) + CONFIG_CARL9170_USB=m \ + CONFIG_CARL9170_LEDS=$(if $(CONFIG_LEDS_TRIGGERS),y) \ + CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),y) \ + CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ EXTRA_CFLAGS = \ - $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD) + $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD) \ + $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_CARL9170_LEDS) \ + $(if $(CONFIG_PACKAGE_CARL9170_DEBUGFS),-DCONFIG_CARL9170_DEBUGFS) \ + $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS) \ define Build/Compile $(MAKE) -C $(LINUX_DIR) \ @@ -61,7 +84,7 @@ endef define KernelPackage/carl9170/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_VERSION)/firmware_build/carl9170.fw $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_VERSION)/firmware_build/carl9170-1.fw $(1)/lib/firmware/ endef $(eval $(call KernelPackage,carl9170)) diff --git a/package/carl9170/patches/100-request_firmware_compat.patch b/package/carl9170/patches/100-request_firmware_compat.patch index f1dae2d014..cc29239c8d 100644 --- a/package/carl9170/patches/100-request_firmware_compat.patch +++ b/package/carl9170/patches/100-request_firmware_compat.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c -@@ -988,11 +988,28 @@ err_failed: +@@ -1000,11 +1000,28 @@ err_failed: ar9170_usb_firmware_failed(aru); } diff --git a/package/carl9170/patches/120-compile_fix.patch b/package/carl9170/patches/120-compile_fix.patch deleted file mode 100644 index 00f0fba847..0000000000 --- a/package/carl9170/patches/120-compile_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/carl9170/fw.c -+++ b/drivers/net/wireless/ath/carl9170/fw.c -@@ -185,8 +185,10 @@ static int ar9170_fw_check(struct ar9170 - if (SUPP(CARL9170FW_WLANTX_CAB)) - ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP); - -+#ifdef CONFIG_CARL9170_WPS_BUTTON - if (!SUPP(CARL9170FW_GPIO_INTERRUPT)) - ar->has_wps_button = false; -+#endif - - #undef SUPPORTED - return 0; -- cgit v1.2.3