X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3063a1d9147f6ecf136fa7146197b5d8891923c5..04273f5eb3d9ad6241de182eea5b710bb049164e:/package/mac80211/Makefile?ds=sidebyside diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 7e0b82413..7b669b0a1 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_VERSION:=2011-03-24 +PKG_VERSION:=2011-05-27 PKG_RELEASE:=2 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources -PKG_MD5SUM:=f5713fb3ab59bdd3d0ce931b813ef960 +PKG_MD5SUM:=3a382b03333aff304dbe8ee94fce6b5a PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) @@ -25,13 +25,17 @@ PKG_DRIVERS = \ rt2500-pci rt2500-usb rt61-pci rt73-usb rt2800-pci rt2800-usb \ rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \ ath9k-common ath9k ath9k-htc ath net-libipw net-ipw2100 net-ipw2200 \ - mwl8k net-hermes net-hermes-pci net-hermes-plx net-hermes-pcmcia + mwl8k net-hermes net-hermes-pci net-hermes-plx net-hermes-pcmcia \ + iwl-legacy iwl3945 iwl4965 iwlagn PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-mac80211 \ $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \ CONFIG_PACKAGE_MAC80211_DEBUGFS \ CONFIG_PACKAGE_ATH_DEBUG \ + CONFIG_PACKAGE_B43_DEBUG \ + CONFIG_PACKAGE_B43_PIO \ + CONFIG_PACKAGE_B43_N_PHY \ CONFIG_ATH_USER_REGD \ CARL9170_FW_VERSION:=1.9.2 @@ -209,15 +213,6 @@ define Download/rt2870 endef $(eval $(call Download,rt2870)) -AR9170FW:=ar9170.fw - -define Download/ar9170 - FILE:=$(AR9170FW) - URL:=http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170 - MD5SUM:=34feec4ec0eae3bb92c7c1ea2dfb4530 -endef -$(eval $(call Download,ar9170)) - NEED_RT2X00_LIB_CRYPTO:=y NEED_RT2X00_LIB_FIRMWARE:=y NEED_RT2X00_LIB_HT:=y @@ -412,7 +407,7 @@ endef define KernelPackage/ath $(call KernelPackage/mac80211/Default) TITLE:=Atheros common driver part - DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT +kmod-mac80211 + DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko AUTOLOAD:=$(call AutoLoad,26,ath) MENU:=1 @@ -440,7 +435,7 @@ define KernelPackage/ath9k-common $(call KernelPackage/mac80211/Default) 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 +@DRIVER_11N_SUPPORT + DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko @@ -451,7 +446,7 @@ 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 + DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath9k-common FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko AUTOLOAD:=$(call AutoLoad,28,ath9k) @@ -562,7 +557,7 @@ define KernelPackage/libertas-sd FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko - AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio) + AUTOLOAD:=$(call AutoLoad,91,libertas libertas_sdio) endef define KernelPackage/mac80211-hwsim @@ -682,6 +677,224 @@ define KernelPackage/net-hermes-pcmcia/description Kernel modules for Hermes based PCMCIA adaptors endef +IWL3945_NAME:=iwlwifi-3945-ucode +IWL3945_VERSION:=15.32.2.9 +IWL3945_MD5SUM:=d99a75ab1305d1532a09471b2f9a547a +IWL4965_NAME:=iwlwifi-4965-ucode +IWL4965_VERSION:=228.61.2.24 +IWL4965_MD5SUM:=2531028773cfc22aca5539c734f2a241 +IWL5000_NAME:=iwlwifi-5000-ucode +IWL5000_VERSION:=8.83.5.1 +IWL5000_MD5SUM:=da82465019b3c7d1ee5156474ab4931d +IWL5150_NAME:=iwlwifi-5150-ucode +IWL5150_VERSION:=8.24.2.2 +IWL5150_MD5SUM:=f9cee16e455e8046b1bf62c93f882d5d +IWL1000_NAME:=iwlwifi-1000-ucode +IWL1000_VERSION:=39.31.5.1 +IWL1000_MD5SUM:=8098503cb2abcdeffffb3ddd2d8d6f60 +IWL6000_NAME:=iwlwifi-6000-ucode +IWL6000_VERSION:=9.221.4.1 +IWL6000_MD5SUM:=c132a4c1946a9dbc0c36b41696e5c793 +IWL6050_NAME:=iwlwifi-6050-ucode +IWL6050_VERSION:=41.28.5.1 +IWL6050_MD5SUM:=cb484a65b9139666d4ddebf60598a87b +IWL6005_NAME:=iwlwifi-6000g2a-ucode +IWL6005_VERSION:=17.168.5.2 +IWL6005_MD5SUM:=0b9579f4b8faf51c955295607a8e79a8 +IWL6030_NAME:=iwlwifi-6000g2b-ucode +IWL6030_VERSION:=17.168.5.2 +IWL6030_MD5SUM:=d87411296b4eeda0c91322228e9f8437 +IWL100_NAME:=iwlwifi-100-ucode +IWL100_VERSION:=39.31.5.1 +IWL100_MD5SUM:=b686f0ab94888ccca3ce74d2d6ee1133 + + +define Download/iwl-fw/Default + URL:=http://intellinuxwireless.org/iwlwifi/downloads/ +endef + +define Download/iwl3945-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL3945_NAME)-$(IWL3945_VERSION).tgz + MD5SUM:=$(IWL3945_MD5SUM) +endef +$(eval $(call Download,iwl3945-fw)) + +define Download/iwl4965-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL4965_NAME)-$(IWL4965_VERSION).tgz + MD5SUM:=$(IWL4965_MD5SUM) +endef +$(eval $(call Download,iwl4965-fw)) + +define Download/iwl5000-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL5000_NAME)-$(IWL5000_VERSION).tgz + MD5SUM:=$(IWL5000_MD5SUM) +endef +$(eval $(call Download,iwl5000-fw)) + +define Download/iwl5150-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL5150_NAME)-$(IWL5150_VERSION).tgz + MD5SUM:=$(IWL5150_MD5SUM) +endef +$(eval $(call Download,iwl5150-fw)) + +define Download/iwl1000-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL1000_NAME)-$(IWL1000_VERSION).tgz + MD5SUM:=$(IWL1000_MD5SUM) +endef +$(eval $(call Download,iwl1000-fw)) + +define Download/iwl6000-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL6000_NAME)-$(IWL6000_VERSION).tgz + MD5SUM:=$(IWL6000_MD5SUM) +endef +$(eval $(call Download,iwl6000-fw)) + +define Download/iwl6050-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL6050_NAME)-$(IWL6050_VERSION).tgz + MD5SUM:=$(IWL6050_MD5SUM) +endef +$(eval $(call Download,iwl6050-fw)) + +define Download/iwl6005-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL6005_NAME)-$(IWL6005_VERSION).tgz + MD5SUM:=$(IWL6005_MD5SUM) +endef +$(eval $(call Download,iwl6005-fw)) + +define Download/iwl6030-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL6030_NAME)-$(IWL6030_VERSION).tgz + MD5SUM:=$(IWL6030_MD5SUM) +endef +$(eval $(call Download,iwl6030-fw)) + +define Download/iwl100-fw + $(call Download/iwl-fw/Default) + FILE:=$(IWL100_NAME)-$(IWL100_VERSION).tgz + MD5SUM:=$(IWL100_MD5SUM) +endef +$(eval $(call Download,iwl100-fw)) + +define KernelPackage/iwlagn + $(call KernelPackage/mac80211/Default) + DEPENDS:= +kmod-mac80211 @PCI_SUPPORT + TITLE:=Intel AGN Wireless support + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlagn.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,iwlagn) + MENU:=1 +endef + +define KernelPackage/iwlagn/description + iwlagn kernel module for Intel 5000/5150/1000/6000/6050/6005/6030/100 support +endef + +define KernelPackage/iwlagn/config + menu "Configuration" + depends on PACKAGE_kmod-iwlagn + + config IWL5000_FW + bool "Intel 5000 Firmware" + default y + help + Download and install firmware for: + Intel 5000 wireless card into /lib/firmware. + + config IWL5150_FW + bool "Intel 5150 Firmware" + default y + help + Download and install firmware for: + Intel 5150 wireless card into /lib/firmware. + + config IWL1000_FW + bool "Intel 1000 Firmware" + default y + help + Download and install firmware for: + Intel 1000 wireless card into /lib/firmware. + + config IWL6000_FW + bool "Intel 6000 Firmware" + default y + help + Download and install firmware for: + Intel 6000 wireless card into /lib/firmware. + + config IWL6050_FW + bool "Intel 6050 Firmware" + default y + help + Download and install firmware for: + Intel 6050 wireless card into /lib/firmware. + + config IWL6005_FW + bool "Intel 6005 Firmware" + default y + help + Download and install firmware for: + Intel 6005 wireless card into /lib/firmware. + + config IWL6030_FW + bool "Intel 6030 Firmware" + default y + help + Download and install firmware for: + Intel 6030 wireless card into /lib/firmware. + + config IWL100_FW + bool "Intel 100 Firmware" + default y + help + Download and install firmware for: + Intel 100 wireless card into /lib/firmware. + + endmenu +endef + +define KernelPackage/iwl-legacy + $(call KernelPackage/mac80211/Default) + DEPENDS:= +kmod-mac80211 @PCI_SUPPORT + TITLE:=Intel legacy Wireless support + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl-legacy.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,iwl-legacy) +endef + +define KernelPackage/iwl-legacy/description + iwl-legacy kernel module for legacy Intel wireless support +endef + +define KernelPackage/iwl3945 + $(call KernelPackage/mac80211/Default) + DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy + TITLE:=Intel iwl3945 Wireless support + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,61,iwl3945) +endef + +define KernelPackage/iwl3945/description + iwl3945 kernel module for Intel 3945 support +endef + +define KernelPackage/iwl4965 + $(call KernelPackage/mac80211/Default) + DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy + TITLE:=Intel iwl4965 Wireless support + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,61,iwl4965) +endef + +define KernelPackage/iwl4965/description + iwl4965 kernel module for Intel 4965 support +endef + define KernelPackage/mwl8k $(call KernelPackage/mac80211/Default) @@ -697,7 +910,15 @@ define KernelPackage/mwl8k/description endef #Broadcom firmware -ifneq ($(CONFIG_B43_EXPERIMENTAL),) +ifneq ($(CONFIG_B43_FW_5_10),) + PKG_B43_FWV4_NAME:=broadcom-wl + PKG_B43_FWV4_VERSION:=5.10.56.27.3 + PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/driver/wl_apsta/wl_prebuilt.o + PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)_mipsel.tar.bz2 + PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ + PKG_B43_FWV4_MD5SUM:=3363e3a6b3d9d73c49dea870c7834eac +else +ifneq ($(CONFIG_B43_FW_4_178),) PKG_B43_FWV4_NAME:=broadcom-wl PKG_B43_FWV4_VERSION:=4.178.10.4 PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl_apsta.o @@ -712,6 +933,7 @@ else PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ PKG_B43_FWV4_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60 endif +endif ifneq ($(CONFIG_B43_OPENFIRMWARE),) PKG_B43_FWV4_NAME:=broadcom-wl PKG_B43_FWV4_VERSION:=5.2 @@ -738,11 +960,11 @@ ifeq ($(CONFIG_B43_OPENFIRMWARE),y) PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/fwcutter/ else PKG_B43_FWCUTTER_NAME:=b43-fwcutter - PKG_B43_FWCUTTER_VERSION:=013 + PKG_B43_FWCUTTER_VERSION:=014 PKG_B43_FWCUTTER_SOURCE:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION).tar.bz2 PKG_B43_FWCUTTER_PROTO:=default PKG_B43_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/ - PKG_B43_FWCUTTER_MD5SUM:=3547ec6c474ac1bc2c4a5bb765b791a4 + PKG_B43_FWCUTTER_MD5SUM:=dd63f9149510bd6e01b89314e955083b PKG_B43_FWCUTTER_SUBDIR:=b43-fwcutter-$(PKG_B43_FWCUTTER_VERSION) PKG_B43_FWCUTTER_OBJECT:=$(PKG_B43_FWCUTTER_NAME)-$(PKG_B43_FWCUTTER_VERSION)/ endif @@ -794,19 +1016,19 @@ define KernelPackage/b43/config choice prompt "b43 firmware version" - default B43_STABLE + default B43_FW_4_150 help This option allows you to select the version of the b43 firmware. - config B43_STABLE - bool "4.150.10.5 (stable)" + config B43_FW_4_150 + bool "Firmware 410.2160 from driver 4.150.10.5 (stable)" help Stable firmware for BCM43xx devices. If unsure, select this. - config B43_EXPERIMENTAL - bool "4.178.10.4 (experimental)" + config B43_FW_4_178 + bool "Firmware 478.104 from driver 4.178.10.4" help Experimental firmware for BCM43xx devices. @@ -814,6 +1036,15 @@ define KernelPackage/b43/config If unsure, select the "stable" firmware. + config B43_FW_5_10 + bool "Firmware 508.1084 from driver 5.10.56.27" + help + Newer experimental firmware for BCM43xx devices. + + This firmware is mostly untested. It is needed for some N-PHY devices. + + If unsure, select the "stable" firmware. + config B43_OPENFIRMWARE bool "Open FirmWare for WiFi networks" help @@ -843,7 +1074,8 @@ define KernelPackage/b43/config config B43_FW_SQUASH_COREREVS string "Core revisions to include" depends on B43_FW_SQUASH - default "5,6,7,8,9,10,13,14,15" + default "5,6,7,8,9,10,11,13,14,15,16" if PACKAGE_B43_PHY_N + default "5,6,7,8,9,10,13,14,15" if !PACKAGE_B43_PHY_N help This is a comma seperated list of core revision numbers. @@ -856,7 +1088,8 @@ define KernelPackage/b43/config config B43_FW_SQUASH_PHYTYPES string "PHY types to include" depends on B43_FW_SQUASH - default "G,LP" + default "G,LP,N" if PACKAGE_B43_PHY_N + default "G,LP" if !PACKAGE_B43_PHY_N help This is a comma seperated list of PHY types: A => A-PHY @@ -871,6 +1104,35 @@ define KernelPackage/b43/config Example (keep files for G-PHY and N-PHY): G,N + config PACKAGE_B43_DEBUG + bool "Enable debug output and debugfs for b43" + default n + help + Enable additional debug output and runtime sanity checks for b43 + and enables the debugfs interface. + + If unsure, say N. + + config PACKAGE_B43_PIO + bool "Enable support for PIO transfer mode" + default n + help + Enable support for using PIO instead of DMA. Unless you have DMA + transfer problems you don't need this. + + If unsure, say N. + + config PACKAGE_B43_PHY_N + bool "Enable support for N-PHYs" + select B43_FW_5_10 + default n + help + Enable support for BCM4321 and BCM4322. + + Currently only 11g speed is available. + + If unsure, say N. + endmenu endef @@ -924,13 +1186,18 @@ BUILDFLAGS:= \ -I$(PKG_BUILD_DIR)/include \ $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \ $(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT) \ - $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \ + $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \ -DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \ - $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS -DCONFIG_ATH9K_HTC_DEBUGFS) \ - $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG -DCONFIG_ATH5K_DEBUG) \ + $(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \ + $(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \ + $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS -DCONFIG_ATH9K_HTC_DEBUGFS -DCONFIG_ATH5K_DEBUG) \ + $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \ -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ -DCONFIG_MAC80211_RC_MINSTREL_HT \ $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD=1) \ + $(if $(CONFIG_PACKAGE_B43_DEBUG),-DCONFIG_B43_DEBUG) \ + $(if $(CONFIG_PACKAGE_B43_PIO),-DCONFIG_B43_PIO) \ + $(if $(CONFIG_PACKAGE_B43_PHY_N),-DCONFIG_B43_PHY_N) \ $(if $(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS),-DCONFIG_RT2X00_LIB_DEBUGFS) \ $(if $(CONFIG_PACKAGE_RT2X00_DEBUG),-DCONFIG_RT2X00_DEBUG) \ $(if $(NEED_RT2X00_LIB_HT),-DCONFIG_RT2X00_LIB_HT) \ @@ -940,7 +1207,9 @@ BUILDFLAGS:= \ $(if $(CONFIG_PACKAGE_kmod-rt2x00-pci),-DCONFIG_RT2X00_LIB_PCI) \ $(if $(CONFIG_PACKAGE_kmod-rt2x00-usb),-DCONFIG_RT2X00_LIB_USB) \ $(if $(CONFIG_PACKAGE_kmod-rt2x00-soc),-DCONFIG_RT2X00_LIB_SOC) \ - $(if $(CONFIG_TARGET_atheros),-DCONFIG_ATH5K_AHB,-DCONFIG_ATH5K_PCI) + $(if $(CONFIG_TARGET_atheros),-DCONFIG_ATH5K_AHB,-DCONFIG_ATH5K_PCI) \ + $(if $(CONFIG_PACKAGE_kmod-iwl3945),-DCONFIG_IWL3945) \ + $(if $(CONFIG_PACKAGE_kmod-iwl4965),-DCONFIG_COMPAT_IWL4965) MAKE_OPTS:= \ CROSS_COMPILE="$(KERNEL_CROSS)" \ @@ -960,14 +1229,20 @@ MAKE_OPTS:= \ CONFIG_B43LEGACY_HWRNG=$(if $(CONFIG_HW_RANDOM),y) \ CONFIG_B43=$(if $(CONFIG_PACKAGE_kmod-b43),m) \ CONFIG_B43LEGACY=$(if $(CONFIG_PACKAGE_kmod-b43legacy),m) \ + CONFIG_B43_DEBUG=$(if $(CONFIG_PACKAGE_B43_DEBUG),y) \ + CONFIG_B43_PIO=$(if $(CONFIG_PACKAGE_B43_PIO),y) \ + CONFIG_B43_PHY_N=$(if $(CONFIG_PACKAGE_B43_PHY_N),y) \ CONFIG_ATH_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath),m) \ CONFIG_ATH_DEBUG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ - CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ + CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_ATH9K_PKTLOG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ CONFIG_ATH5K=$(if $(CONFIG_PACKAGE_kmod-ath5k),m) \ CONFIG_ATH5K_PCI=$(if $(CONFIG_TARGET_atheros),,y) \ CONFIG_ATH5K_AHB=$(if $(CONFIG_TARGET_atheros),y) \ + CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ + CONFIG_ATH9K_PCI=$(CONFIG_PCI) \ + CONFIG_ATH9K_AHB=$(if $(CONFIG_TARGET_ar71xx),y) \ 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) \ @@ -1018,9 +1293,10 @@ MAKE_OPTS:= \ CONFIG_LIB80211_CRYPT_WEP= \ CONFIG_LIB80211_CRYPT_CCMP= \ CONFIG_LIB80211_CRYPT_TKIP= \ - CONFIG_COMPAT_IWLWIFI= \ - CONFIG_IWLWIFI_LEGACY= \ - CONFIG_IWLAGN= \ + CONFIG_IWLAGN=$(if $(CONFIG_PACKAGE_kmod-iwlagn),m) \ + CONFIG_IWLWIFI_LEGACY=$(if $(CONFIG_PACKAGE_kmod-iwl-legacy),m) \ + CONFIG_COMPAT_IWL4965=$(if $(CONFIG_PACKAGE_kmod-iwl4965),m) \ + CONFIG_IWL3945=$(if $(CONFIG_PACKAGE_kmod-iwl3945),m) \ CONFIG_MWL8K=$(if $(CONFIG_PACKAGE_kmod-mwl8k),m) \ CONFIG_ATMEL= \ CONFIG_PCMCIA_ATMEL= \ @@ -1043,12 +1319,10 @@ MAKE_OPTS:= \ CONFIG_NORTEL_HERMES= \ CONFIG_PCMCIA_SPECTRUM= \ CONFIG_ORINOCO_USB= \ - CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \ - CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_IWM= \ + CONFIG_MWIFIEX= \ CONFIG_MAC80211_RC_MINSTREL_HT=y \ MADWIFI= \ - OLD_IWL= \ KLIB_BUILD="$(LINUX_DIR)" \ MODPROBE=: \ KLIB=$(TARGET_MODULES_DIR) \ @@ -1070,10 +1344,19 @@ define Build/Prepare -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2870FW) $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION).tgz + $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL100_NAME)-$(IWL100_VERSION).tgz $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 rm -rf $(PKG_BUILD_DIR)/include/linux/ssb rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h - rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) @@ -1154,11 +1437,6 @@ define KernelPackage/zd1211rw/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 endef -define KernelPackage/ar9170/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(AR9170FW) $(1)/lib/firmware/ -endef - define KernelPackage/ath9k-htc/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) \ @@ -1178,6 +1456,44 @@ define KernelPackage/net-ipw2200/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware endef +define KernelPackage/iwlagn/install + $(INSTALL_DIR) $(1)/lib/firmware +ifneq ($(CONFIG_IWL5000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION)/iwlwifi-5000-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL5150_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION)/iwlwifi-5150-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL1000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION)/iwlwifi-1000-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION)/iwlwifi-6000-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6050_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION)/iwlwifi-6050-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6005_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION)/iwlwifi-6000g2a-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6030_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION)/iwlwifi-6000g2b-*.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL100_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL100_NAME)-$(IWL100_VERSION)/iwlwifi-100-*.ucode $(1)/lib/firmware +endif +endef + +define KernelPackage/iwl3945/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION)/iwlwifi-3945-*.ucode $(1)/lib/firmware +endef + +define KernelPackage/iwl4965/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION)/iwlwifi-4965-*.ucode $(1)/lib/firmware +endef + define Build/b43-common tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)" $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \ @@ -1261,6 +1577,10 @@ $(eval $(call KernelPackage,b43legacy)) $(eval $(call KernelPackage,net-libipw)) $(eval $(call KernelPackage,net-ipw2100)) $(eval $(call KernelPackage,net-ipw2200)) +$(eval $(call KernelPackage,iwlagn)) +$(eval $(call KernelPackage,iwl-legacy)) +$(eval $(call KernelPackage,iwl4965)) +$(eval $(call KernelPackage,iwl3945)) $(eval $(call KernelPackage,mwl8k)) $(eval $(call KernelPackage,net-hermes)) $(eval $(call KernelPackage,net-hermes-pci))