X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f3a65e72dbe5884ceb0f421429ce0d1f29fcb8fa..4669033c1418465423dd5ee5410224161801525d:/package/mac80211/Makefile diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 70ec95e1b..3b438d9be 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_VERSION:=2011-04-06 -PKG_RELEASE:=3 +PKG_VERSION:=2011-09-14 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources -PKG_MD5SUM:=7ef8c2d9ee25af7ed33cf339f2484249 +PKG_MD5SUM:=a5627e6079e8d0f0baf7045141503a3d PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) @@ -26,7 +26,7 @@ PKG_DRIVERS = \ 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 \ - iwl-legacy iwl3945 iwl4965 iwlagn + iwl-legacy iwl3945 iwl4965 iwlagn lib80211 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-mac80211 \ @@ -55,18 +55,10 @@ define KernelPackage/cfg80211 $(call KernelPackage/mac80211/Default) TITLE:=cfg80211 - wireless configuration API DEPENDS+= +wireless-tools +iw +crda -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) FILES:= \ $(PKG_BUILD_DIR)/compat/compat.ko \ $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko AUTOLOAD:=$(call AutoLoad,20,compat cfg80211) -else - FILES:= \ - $(PKG_BUILD_DIR)/compat/compat.ko \ - $(PKG_BUILD_DIR)/compat/compat_firmware_class.ko \ - $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko - AUTOLOAD:=$(call AutoLoad,20,compat compat_firmware_class cfg80211) -endif endef define KernelPackage/cfg80211/description @@ -104,6 +96,23 @@ define KernelPackage/mac80211/description Generic IEEE 802.11 Networking Stack (mac80211) endef +PKG_LINUX_FIRMWARE_NAME:=linux-firmware +PKG_LINUX_FIRMWARE_VERSION:=97649b1e5449029c845ebf7500e780a8867c3e89 +PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 +PKG_LINUX_FIRMWARE_PROTO:=git +PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +PKG_LINUX_FIRMWARE_SUBDIR:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION) + +define Download/linux-firmware + FILE:=$(PKG_LINUX_FIRMWARE_SOURCE) + URL:=$(PKG_LINUX_FIRMWARE_SOURCE_URL) + MD5SUM:=$(PKG_LINUX_FIRMWARE_MD5SUM) + PROTO:=$(PKG_LINUX_FIRMWARE_PROTO) + VERSION:=$(PKG_LINUX_FIRMWARE_VERSION) + SUBDIR:=$(PKG_LINUX_FIRMWARE_SUBDIR) +endef +$(eval $(call Download,linux-firmware)) + # Prism54 drivers P54PCIFW:=2.13.12.0.arm P54USBFW:=2.13.24.0.lm87.arm @@ -179,51 +188,9 @@ define KernelPackage/p54-spi AUTOLOAD:=$(call AutoLoad,31,p54spi) endef -# Ralink rt2x00 drivers -RT61FW:=RT61_Firmware_V1.2.zip -RT71FW:=RT71W_Firmware_V1.8.zip -RT2860FW:=RT2860_Firmware_V11.zip -RT2870FW:=RT2870_Firmware_V8.zip - -define Download/rt61 - FILE:=$(RT61FW) - URL:=http://www.ralinktech.com.tw/data/ - MD5SUM:=d4c690c93b470bc9a681297c2adc6281 -endef -$(eval $(call Download,rt61)) - -define Download/rt71w - FILE:=$(RT71FW) - URL:=http://www.ralinktech.com.tw/data/ - MD5SUM:=1e7a5dc574e0268574fcda3fd5cf52f7 -endef -$(eval $(call Download,rt71w)) - -define Download/rt2860 - FILE:=$(RT2860FW) - URL:=http://www.ralinktech.com.tw/data/drivers - MD5SUM:=440a81756a52c53528f16faa41c40124 -endef -$(eval $(call Download,rt2860)) - -define Download/rt2870 - FILE:=$(RT2870FW) - URL:=http://www.ralinktech.com.tw/data/drivers - MD5SUM:=a7aae1d8cfd68e4d86a73000df0b6584 -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_EEPROM:=y NEED_RT2X00_LIB_HT:=y NEED_RT2X00_LIB_LEDS:=y @@ -416,7 +383,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 @@ -444,7 +411,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 @@ -455,7 +422,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) @@ -466,31 +433,6 @@ 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 @@ -519,35 +461,30 @@ define KernelPackage/carl9170/install $(INSTALL_DATA) $(DL_DIR)/$(CARL9170_FW)-$(CARL9170_FW_VERSION) $(1)/lib/firmware/$(CARL9170_FW) endef - -USB8388FW_NAME:=usb8388 -USB8388FW_VERSION:=5.110.22.p23 - -define Download/usb8388 - URL:=http://dev.laptop.org/pub/firmware/libertas/ - FILE:=$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin - MD5SUM=5e38f55719df3d0c58dd3bd02575a09c -endef -$(eval $(call Download,usb8388)) - -SD8686FW_NAME:=sd8686 -SD8686FW_VERSION:=9.70.7.p0 - -define Download/sd8686 - URL:=http://dev.laptop.org/pub/firmware/libertas/ - FILE:=$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin - MD5SUM=b4f8be61e19780a14836f146c538c5dd -endef -$(eval $(call Download,sd8686)) - -SD8686HELPER_NAME:=sd8686_helper - -define Download/sd8686_helper - URL:=http://dev.laptop.org/pub/firmware/libertas/ - FILE:=$(SD8686HELPER_NAME).bin - MD5SUM=2a4d8f4df198ce949c350df5674f4ac6 +define KernelPackage/lib80211 + $(call KernelPackage/mac80211/Default) + TITLE:=802.11 Networking stack + FILES:= \ + $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \ + $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \ + $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_ccmp.ko \ + $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_tkip.ko + AUTOLOAD:=$(call AutoLoad,10, \ + lib80211 \ + lib80211_crypt_wep \ + lib80211_crypt_ccmp \ + lib80211_crypt_tkip \ + ) +endef + +define KernelPackage/lib80211/description + Kernel modules for 802.11 Networking stack + Includes: + - lib80211 + - lib80211_crypt_wep + - lib80211_crypt_tkip + - lib80211_crytp_ccmp endef -$(eval $(call Download,sd8686_helper)) define KernelPackage/libertas-usb $(call KernelPackage/mac80211/Default) @@ -686,112 +623,6 @@ 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 @@ -1013,6 +844,7 @@ endef define KernelPackage/b43 $(call KernelPackage/b43-common) + DEPENDS+= +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma TITLE:=Broadcom 43xx wireless support FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko AUTOLOAD:=$(call AutoLoad,30,b43) @@ -1025,7 +857,7 @@ define KernelPackage/b43/config choice prompt "b43 firmware version" - default B43_FW_4_150 + default B43_FW_5_10 help This option allows you to select the version of the b43 firmware. @@ -1083,8 +915,7 @@ 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,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 + default "5,6,7,8,9,10,11,13,14,15,16" help This is a comma seperated list of core revision numbers. @@ -1097,8 +928,7 @@ define KernelPackage/b43/config config B43_FW_SQUASH_PHYTYPES string "PHY types to include" depends on B43_FW_SQUASH - default "G,LP,N" if PACKAGE_B43_PHY_N - default "G,LP" if !PACKAGE_B43_PHY_N + default "G,LP,N" help This is a comma seperated list of PHY types: A => A-PHY @@ -1134,12 +964,32 @@ define KernelPackage/b43/config config PACKAGE_B43_PHY_N bool "Enable support for N-PHYs" select B43_FW_5_10 - default n + default y help Enable support for BCM4321 and BCM4322. Currently only 11g speed is available. + If unsure, say Y. + + config PACKAGE_B43_PHY_HT + bool "Enable support for HT-PHYs" + depends on BROKEN + select B43_FW_5_10 + default n + help + Currently broken. + + If unsure, say N. + + config PACKAGE_B43_PHY_LCN + bool "Enable support for LCN-PHYs" + depends on BROKEN + select B43_FW_5_10 + default n + help + Currently broken. + If unsure, say N. endmenu @@ -1195,21 +1045,29 @@ 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 -DCONFIG_ATH5K_DEBUG) \ + $(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \ + $(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \ + $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_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_PIO),-DCONFIG_B43_BCMA_PIO) \ $(if $(CONFIG_PACKAGE_B43_PHY_N),-DCONFIG_B43_PHY_N) \ + $(if $(CONFIG_PACKAGE_B43_PHY_HT),-DCONFIG_B43_PHY_HT) \ + $(if $(CONFIG_PACKAGE_B43_PHY_LCN),-DCONFIG_B43_PHY_LCN) \ + -DCONFIG_B43_BCMA \ + -DCONFIG_B43_SSB \ $(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) \ $(if $(NEED_RT2X00_LIB_CRYPTO),-DCONFIG_RT2X00_LIB_CRYPTO) \ $(if $(NEED_RT2X00_LIB_FIRMWARE),-DCONFIG_RT2X00_LIB_FIRMWARE) \ + $(if $(NEED_RT2X00_LIB_EEPROM),-DCONFIG_RT2X00_LIB_EEPROM) \ $(if $(NEED_RT2X00_LIB_LEDS),-DCONFIG_RT2X00_LIB_LEDS) \ $(if $(CONFIG_PACKAGE_kmod-rt2x00-pci),-DCONFIG_RT2X00_LIB_PCI) \ $(if $(CONFIG_PACKAGE_kmod-rt2x00-usb),-DCONFIG_RT2X00_LIB_USB) \ @@ -1226,6 +1084,7 @@ MAKE_OPTS:= \ CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ + CONFIG_CFG80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_MAC80211_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \ CONFIG_B43_PCI_AUTOSELECT=$(if $(CONFIG_PCI),y) \ @@ -1238,17 +1097,24 @@ MAKE_OPTS:= \ 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_BCMA_PIO=$(if $(CONFIG_PACKAGE_B43_PIO),y) \ CONFIG_B43_PHY_N=$(if $(CONFIG_PACKAGE_B43_PHY_N),y) \ + CONFIG_B43_PHY_HT=$(if $(CONFIG_PACKAGE_B43_PHY_HT),y) \ + CONFIG_B43_PHY_LCN=$(if $(CONFIG_PACKAGE_B43_PHY_LCN),y) \ + CONFIG_B43_BCMA=y \ + CONFIG_B43_SSB=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_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_HTC_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ 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) \ @@ -1268,6 +1134,7 @@ MAKE_OPTS:= \ CONFIG_RT2X00_LIB_DEBUGFS=$(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS) \ CONFIG_RT2X00_LIB_CRYPTO=$(NEED_RT2X00_LIB_CRYPTO) \ CONFIG_RT2X00_LIB_FIRMWARE=$(NEED_RT2X00_LIB_FIRMWARE) \ + CONFIG_RT2X00_LIB_EEPROM=$(NEED_RT2X00_LIB_EEPROM) \ CONFIG_RT2X00_LIB_HT=$(NEED_RT2X00_LIB_HT) \ CONFIG_RT2X00_LIB_LEDS=$(NEED_RT2X00_LIB_LEDS) \ CONFIG_RT2400PCI=$(if $(CONFIG_PACKAGE_kmod-rt2400-pci),m) \ @@ -1288,16 +1155,16 @@ MAKE_OPTS:= \ CONFIG_LIBERTAS=$(if $(CONFIG_PACKAGE_kmod-libertas-sd)$(CONFIG_PACKAGE_kmod-libertas-usb),m) \ CONFIG_LIBERTAS_CS= \ CONFIG_LIBERTAS_SPI= \ - CONFIG_LIBERTAS_SDIO=$(if $(CONFIG_PACKAGE_kmod-libertas-sd),m) \ + CONFIG_COMPAT_LIBERTAS_SDIO=$(if $(CONFIG_PACKAGE_kmod-libertas-sd),m) \ CONFIG_LIBERTAS_THINFIRM= \ CONFIG_LIBERTAS_USB=$(if $(CONFIG_PACKAGE_kmod-libertas-usb),m) \ CONFIG_IPW2100=$(if $(CONFIG_PACKAGE_kmod-net-ipw2100),m) \ CONFIG_IPW2200=$(if $(CONFIG_PACKAGE_kmod-net-ipw2200),m) \ CONFIG_NL80211=y \ - CONFIG_LIB80211= \ - CONFIG_LIB80211_CRYPT_WEP= \ - CONFIG_LIB80211_CRYPT_CCMP= \ - CONFIG_LIB80211_CRYPT_TKIP= \ + CONFIG_LIB80211=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ + CONFIG_LIB80211_CRYPT_WEP=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ + CONFIG_LIB80211_CRYPT_CCMP=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ + CONFIG_LIB80211_CRYPT_TKIP=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ 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) \ @@ -1324,12 +1191,15 @@ 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= \ + CONFIG_B44= \ + CONFIG_ATL1= \ + CONFIG_ATL2= \ + CONFIG_ATL1E= \ + CONFIG_ATL1C= \ KLIB_BUILD="$(LINUX_DIR)" \ MODPROBE=: \ KLIB=$(TARGET_MODULES_DIR) \ @@ -1345,26 +1215,13 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(PKG_UNPACK) $(Build/Patch) - unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW) - unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW) - -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2860FW) - -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 + $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE) rm -rf $(PKG_BUILD_DIR)/include/linux/ssb + rm -rf $(PKG_BUILD_DIR)/include/linux/bcma rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h - rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) @@ -1390,14 +1247,25 @@ endef define KernelPackage/libertas-usb/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v9.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v5.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8682.bin \ + $(1)/lib/firmware/ endef define KernelPackage/libertas-sd/install - echo "Libertas install: $(CONFIG_PACKAGE_kmod-libertas-sd)" - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin $(1)/lib/firmware/$(SD8686FW_NAME).bin - $(INSTALL_DATA) $(DL_DIR)/$(SD8686HELPER_NAME).bin $(1)/lib/firmware/$(SD8686HELPER_NAME).bin + $(INSTALL_DIR) $(1)/lib/firmware/libertas + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385_helper.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9_helper.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v8_helper.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v8.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688_helper.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688.bin \ + $(1)/lib/firmware/libertas endef define KernelPackage/cfg80211/install @@ -1422,22 +1290,26 @@ endef define KernelPackage/rt61-pci/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2?61*.bin $(1)/lib/firmware/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561s.bin \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2661.bin \ + $(1)/lib/firmware/ endef define KernelPackage/rt73-usb/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt73.bin $(1)/lib/firmware/ endef define KernelPackage/rt2800-pci/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2860.bin $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2860.bin $(1)/lib/firmware/ endef define KernelPackage/rt2800-usb/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2870.bin $(1)/lib/firmware/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2870.bin $(1)/lib/firmware/ endef define KernelPackage/zd1211rw/install @@ -1445,17 +1317,22 @@ define KernelPackage/zd1211rw/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 endef -define KernelPackage/ar9170/install +define KernelPackage/ath9k-htc/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(AR9170FW) $(1)/lib/firmware/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar9271.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar7010.fw \ + $(1)/lib/firmware/ endef -define KernelPackage/ath9k-htc/install +define KernelPackage/mwl8k/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) \ - $(DL_DIR)/$(AR9271FW) \ - $(DL_DIR)/$(AR7010FW) \ - $(DL_DIR)/$(AR7010_1_1_FW) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366_ap-2.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8366.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8687.fw \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8687.fw \ $(1)/lib/firmware/ endef @@ -1472,43 +1349,44 @@ 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 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL5150_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION)/iwlwifi-5150-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL1000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION)/iwlwifi-1000-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL6000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION)/iwlwifi-6000-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL6050_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION)/iwlwifi-6050-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL6005_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION)/iwlwifi-6000g2a-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2a-5.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL6030_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION)/iwlwifi-6000g2b-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2b-5.ucode $(1)/lib/firmware endif ifneq ($(CONFIG_IWL100_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL100_NAME)-$(IWL100_VERSION)/iwlwifi-100-*.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.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 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3945-2.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 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware endef define Build/b43-common tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)" + patch -p1 -d "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" < ./files/b43-fwcutter-fw-dirname.patch $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \ CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h" \ QUIET_SPARSE=: @@ -1556,6 +1434,7 @@ endif endef $(eval $(call KernelPackage,ath5k)) +$(eval $(call KernelPackage,lib80211)) $(eval $(call KernelPackage,libertas-usb)) $(eval $(call KernelPackage,libertas-sd)) $(eval $(call KernelPackage,cfg80211))