mac80211: iwlagn: enable iwlmvm

[openwrt/openwrt.git] / package / kernel / mt76 / Makefile

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 345c038dce85ce22a6489640a7bbd36360294133..4799efefcb19fb04a953e210229c020e5f7b29c8 100644 (file)
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_VERSION:=2015-03-11
+PKG_VERSION:=2015-08-28
 PKG_RELEASE=1
 
 PKG_LICENSE:=GPLv2
@@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a94e01211aed8eac39331bc030fd3474357f05e0
+PKG_SOURCE_VERSION:=b6de6a08e46e1a1087a1fcd41a2ee0590de7c4a0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
@@ -33,8 +33,13 @@ NOSTDINC_FLAGS = \
        -I$(STAGING_DIR)/usr/include/mac80211-backport \
        -I$(STAGING_DIR)/usr/include/mac80211/uapi \
        -I$(STAGING_DIR)/usr/include/mac80211 \
+       -include backport/autoconf.h \
        -include backport/backport.h
 
+ifdef CONFIG_PACKAGE_MAC80211_MESH
+  NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
+endif
+
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
@@ -46,8 +51,10 @@ endef
 
 define KernelPackage/mt76/install
        $(INSTALL_DIR) $(1)/lib/firmware
-       $(CP) $(PKG_BUILD_DIR)/firmware/mt7662_patch_e3_hdr_v0.0.2_P48.bin $(1)/lib/firmware/mt7662_rom_patch.bin
-       $(CP) $(PKG_BUILD_DIR)/firmware/mt7662_firmware_e3_v1.5.bin $(1)/lib/firmware/mt7662.bin
+       cp \
+               $(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
+               $(PKG_BUILD_DIR)/firmware/mt7662.bin \
+               $(1)/lib/firmware
 endef
 
 $(eval $(call KernelPackage,mt76))