X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c8de904b8c3260e4dcf0e0ac170e886afc4b0e27..ef6a8e56be15d3a82b33376a6400542435b0603d:/package/mac80211/Makefile diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 2fe0b9add..b7c0fe059 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -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 \ @@ -469,6 +469,31 @@ define KernelPackage/carl9170/install $(INSTALL_DATA) $(DL_DIR)/$(CARL9170_FW)-$(CARL9170_FW_VERSION) $(1)/lib/firmware/$(CARL9170_FW) endef +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 + define KernelPackage/libertas-usb $(call KernelPackage/mac80211/Default) DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211 @@ -827,6 +852,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) @@ -839,7 +865,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. @@ -897,8 +923,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. @@ -911,8 +936,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 @@ -948,12 +972,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 @@ -1020,7 +1064,12 @@ BUILDFLAGS:= \ $(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) \ @@ -1056,7 +1105,12 @@ 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_ATH9K_PKTLOG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ @@ -1115,10 +1169,10 @@ MAKE_OPTS:= \ 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) \ @@ -1174,6 +1228,7 @@ define Build/Prepare $(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 endef @@ -1386,6 +1441,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))