X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=package%2Fkernel%2Fmac80211%2FMakefile;h=40b08c08dd9690007c98e59c495ffc8ecf7b25ba;hp=d71417ec35edcd94524881ecf64ee8fca04132d5;hb=5b76e57dc2e047a3e98401d3ef8d47f0c2f8a0ee;hpb=8f91c80ea13abc5c66cee9f1b6d10d7b392dd16e diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index d71417ec35..40b08c08dd 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -10,11 +10,11 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_VERSION:=2015-03-09 -PKG_RELEASE:=2 +PKG_VERSION:=2015-07-21 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_BACKPORT_VERSION:= -PKG_MD5SUM:=6d4b04e4ce8a1f54dabfb04f4709453c +PKG_MD5SUM:=ec529acfb9c942daf8116e5cff47c999 PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) @@ -60,7 +60,6 @@ define KernelPackage/mac80211/Default SUBMENU:=$(WMENU) URL:=https://wireless.wiki.kernel.org/ MAINTAINER:=Felix Fietkau - DEPENDS:=@(!TARGET_avr32||BROKEN) endef define KernelPackage/cfg80211 @@ -79,7 +78,7 @@ endef define KernelPackage/mac80211 $(call KernelPackage/mac80211/Default) TITLE:=Linux 802.11 Wireless Networking Stack - DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 +hostapd-common + DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-cfg80211 +hostapd-common KCONFIG:=\ CONFIG_AVERAGE=y FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko @@ -109,8 +108,8 @@ Generic IEEE 802.11 Networking Stack (mac80211) endef PKG_LINUX_FIRMWARE_NAME:=linux-firmware -PKG_LINUX_FIRMWARE_VERSION:=7f388b4885cf64d6b7833612052d20d4197af96f -PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-2014-06-04-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 +PKG_LINUX_FIRMWARE_VERSION:=f404336ba808cbd57547196e13367079a23b822c +PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-2015-03-20-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 PKG_LINUX_FIRMWARE_PROTO:=git PKG_LINUX_FIRMWARE_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git PKG_LINUX_FIRMWARE_SUBDIR:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION) @@ -128,7 +127,7 @@ endef $(eval $(call Download,linux-firmware)) PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware -PKG_ATH10K_LINUX_FIRMWARE_VERSION:=da0f85d924226ee30c46e037120621c9e192b39e +PKG_ATH10K_LINUX_FIRMWARE_VERSION:=b46f3e01a6c1f9150fb4612ef53611d714565842 PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2 PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git @@ -516,7 +515,7 @@ define KernelPackage/ath/config bool "Atheros wireless debugging" help Say Y, if you want to debug atheros wireless drivers. - Right now only ath9k makes use of this. + Only ath9k & ath10k make use of this. config PACKAGE_ATH_DFS bool "Enable DFS support" @@ -624,12 +623,12 @@ endef define KernelPackage/ath10k/config if PACKAGE_kmod-ath10k - config ATH10K_STA_FW - bool "Firmware optimized for STA operation" + config ATH10K_API2_FW + bool "Firmware optimized for AP operation (v10.1 / API v2)" default n help - Use the ath10k firmware optimized for wireless client instead - of access point operation. + Use the ath10k firmware from the 10.1 SDK using API v2 optimized + for access point operation if the default firmware keeps crashing. endif endef @@ -699,7 +698,7 @@ endef define KernelPackage/net-libipw $(call KernelPackage/mac80211/Default) TITLE:=libipw for ipw2100 and ipw2200 - DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT + DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko AUTOLOAD:=$(call AutoProbe,libipw) endef @@ -1140,7 +1139,7 @@ config PACKAGE_B43_USE_SSB config PACKAGE_B43_USE_BCMA select PACKAGE_kmod-bcma tristate - depends on !TARGET_brcm47xx + depends on !TARGET_brcm47xx && !TARGET_bcm53xx default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA @@ -1235,9 +1234,9 @@ config PACKAGE_B43_USE_BCMA config B43_FW_SQUASH_PHYTYPES string "PHY types to include" depends on B43_FW_SQUASH - default "G,LP" if TARGET_brcm47xx_legacy + default "G,N,LP" if TARGET_brcm47xx_legacy default "N,HT" if TARGET_brcm47xx_mips74k - default "G,LP,N,HT" + default "G,N,LP,HT" help This is a comma seperated list of PHY types: A => A-PHY @@ -1263,7 +1262,7 @@ config PACKAGE_B43_USE_BCMA This allows choosing buses that b43 should support. config PACKAGE_B43_BUSES_BCMA_AND_SSB - depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k + depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx bool "BCMA and SSB" config PACKAGE_B43_BUSES_BCMA @@ -1271,7 +1270,7 @@ config PACKAGE_B43_USE_BCMA bool "BCMA only" config PACKAGE_B43_BUSES_SSB - depends on !TARGET_brcm47xx_mips74k + depends on !TARGET_brcm47xx_mips74k && !TARGET_bcm53xx bool "SSB only" endchoice @@ -1307,7 +1306,6 @@ config PACKAGE_B43_USE_BCMA config PACKAGE_B43_PHY_N bool "Enable support for N-PHYs" - default n if TARGET_brcm47xx_legacy default y help Enable support for N-PHY. This includes support for the following devices: @@ -1859,14 +1857,14 @@ define KernelPackage/ath10k/install $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/ -ifeq ($(CONFIG_ATH10K_STA_FW),y) +ifeq ($(CONFIG_ATH10K_API2_FW),y) $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/main/firmware-2.bin_999.999.0.636 \ + $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.1/firmware-2.bin_10.1.467.2-1 \ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin else $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2.4/firmware-4.bin_10.2.4.45 \ - $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-4.bin + $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2.4/untested/firmware-5.bin_10.2.4.70-2 \ + $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin endif endef @@ -2010,6 +2008,11 @@ ifneq ($(CONFIG_BRCMFMAC_USB),) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43143.bin \ $(1)/lib/firmware/brcm/ endif +ifneq ($(CONFIG_BRCMFMAC_PCIE),) + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43602-pcie.ap.bin \ + $(1)/lib/firmware/brcm/brcmfmac43602-pcie.bin +endif endef $(eval $(call KernelPackage,adm8211))