From 484a793dd4bf50eeb38d164a2e8f7dbfc91d8194 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 13 Mar 2011 18:38:50 +0000 Subject: [PATCH] ath9k: split package into kmod-ath9k and kmod-ath9k-common, add a new package for ath9k_htc SVN-Revision: 26130 --- package/mac80211/Makefile | 74 +++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 46293696c3..0dd55e4b98 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -427,16 +427,25 @@ define KernelPackage/ath5k/description Atheros 5xxx chipset. endef -define KernelPackage/ath9k +define KernelPackage/ath9k-common $(call KernelPackage/mac80211/Default) - TITLE:=Atheros 802.11n wireless cards support + TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) URL:=http://linuxwireless.org/en/users/Drivers/ath9k DEPENDS+= @PCI_SUPPORT +kmod-ath FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ - $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko \ + $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko + AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common) +endef + +define KernelPackage/ath9k + $(call KernelPackage/mac80211/Default) + TITLE:=Atheros 802.11n PCI wireless cards support + URL:=http://linuxwireless.org/en/users/Drivers/ath9k + DEPENDS+= @PCI_SUPPORT +kmod-ath9k-common + FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko - AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common ath9k) + AUTOLOAD:=$(call AutoLoad,28,ath9k) endef define KernelPackage/ath9k/description @@ -444,6 +453,46 @@ This module adds support for wireless adapters based on Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets. endef +AR7010FW:=ar7010.fw +AR7010_1_1_FW:=ar7010_1_1.fw +AR9271FW:=ar9271.fw + +define Download/ar9271 + FILE:=$(AR9271FW) + URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar9271.fw;h=d0ee74a1c8dccb7cc21f5be90f1d4048fa9dbf9e;hb=HEAD;? + MD5SUM:=2e6f5045ec4c5a42bb93ced242bad0ba +endef +$(eval $(call Download,ar9271)) + +define Download/ar7010 + FILE:=$(AR7010FW) + URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar7010.fw;h=840005d0f0c81838c581b8cd5d76c8dd3843731c;hb=HEAD;? + MD5SUM:=59823b82b1f72bed9b044e8cc78ad65c +endef +$(eval $(call Download,ar7010)) + +define Download/ar7010_1_1 + FILE:=$(AR7010_1_1_FW) + URL:=http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=ar7010_1_1.fw;h=684d4cd1a8cac4f58305589e31f9d856d03a8ef0;hb=HEAD;? + MD5SUM:=544fcbe5a93cfa53c7e6d3ded2b05347 +endef +$(eval $(call Download,ar7010_1_1)) + +define KernelPackage/ath9k-htc + $(call KernelPackage/mac80211/Default) + TITLE:=Atheros 802.11n USB device support + URL:=http://linuxwireless.org/en/users/Drivers/ath9k + DEPENDS+= @USB_SUPPORT +kmod-ath9k-common +kmod-usb-core + FILES:= \ + $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_htc.ko + AUTOLOAD:=$(call AutoLoad,28,ath9k_htc) +endef + +define KernelPackage/ath9k/description +This module adds support for wireless adapters based on +Atheros USB AR9271 and AR7010 family of chipsets. +endef + define KernelPackage/carl9170 $(call KernelPackage/mac80211/Default) TITLE:=Driver for Atheros AR9170 USB sticks @@ -910,8 +959,9 @@ MAKE_OPTS:= \ CONFIG_ATH5K_PCI=$(if $(CONFIG_TARGET_atheros),,y) \ CONFIG_ATH5K_AHB=$(if $(CONFIG_TARGET_atheros),y) \ CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ - CONFIG_ATH9K_HW=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ - CONFIG_ATH9K_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ + CONFIG_ATH9K_HTC=$(if $(CONFIG_PACKAGE_kmod-ath9k-htc),m) \ + CONFIG_ATH9K_HW=$(if $(CONFIG_PACKAGE_kmod-ath9k-common),m) \ + CONFIG_ATH9K_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath9k-common),m) \ CONFIG_ATH9K_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_CARL9170=$(if $(CONFIG_PACKAGE_kmod-carl9170),m) \ CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ @@ -987,7 +1037,6 @@ MAKE_OPTS:= \ CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \ CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_IWM= \ - CONFIG_ATH9K_HTC= \ CONFIG_MAC80211_RC_MINSTREL_HT=y \ MADWIFI= \ OLD_IWL= \ @@ -1101,6 +1150,15 @@ define KernelPackage/ar9170/install $(INSTALL_DATA) $(DL_DIR)/$(AR9170FW) $(1)/lib/firmware/ endef +define KernelPackage/ath9k-htc/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) \ + $(DL_DIR)/$(AR9271FW) \ + $(DL_DIR)/$(AR7010FW) \ + $(DL_DIR)/$(AR7010_1_1_FW) \ + $(1)/lib/firmware/ +endef + define KernelPackage/net-ipw2100/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/ipw2100-$(IPW2100_VERSION)*.fw $(1)/lib/firmware @@ -1184,7 +1242,9 @@ $(eval $(call KernelPackage,rtl8180)) $(eval $(call KernelPackage,rtl8187)) $(eval $(call KernelPackage,zd1211rw)) $(eval $(call KernelPackage,mac80211-hwsim)) +$(eval $(call KernelPackage,ath9k-common)) $(eval $(call KernelPackage,ath9k)) +$(eval $(call KernelPackage,ath9k-htc)) $(eval $(call KernelPackage,ath)) $(eval $(call KernelPackage,carl9170)) $(eval $(call KernelPackage,b43)) -- 2.25.1