mt76: update to the latest version from the mt7603 branch, adds support for overridin...

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

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 345c038dce85ce22a6489640a7bbd36360294133..a1225d17c4f0454aac6f869c7fbf50c331d5a683 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:=2016-01-01
 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:=d8d9600e12f49b89d2b1b8342dc9e224cc12be85
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
@@ -23,8 +23,10 @@ define KernelPackage/mt76
   SUBMENU:=Wireless Drivers
   TITLE:=MediaTek MT76x2 wireless driver
   DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
-  FILES:=$(PKG_BUILD_DIR)/mt76pci.ko
-  AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76pci)
+  FILES:=\
+       $(PKG_BUILD_DIR)/mt76.ko \
+       $(PKG_BUILD_DIR)/mt76x2e.ko
+  AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e)
 endef
 
 NOSTDINC_FLAGS = \
@@ -33,8 +35,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 +53,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))