mt76: update to the latest version, fixes a MAC address handling regression

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

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index fb2c995b6328c66dd55434edebc0f0245187e165..99e3242fe8d7cfe72333edb011d2d36331fbd70e 100644 (file)
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -1,7 +1,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_VERSION:=2014-12-10
 PKG_RELEASE=1
 
 PKG_LICENSE:=GPLv2
@@ -9,22 +8,29 @@ 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:=83d0a1a12a9055569cde5786d1304c83d2d9bc0a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE_DATE:=2017-02-03
+PKG_SOURCE_VERSION:=a5eaeb27d6a80c012ffc8b5bb5549983e446b4ef
+PKG_MIRROR_HASH:=c526586aba890c5645320145219bd5932e39cfc2ea540d7674c9a58ab9a4a36a
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
 
+STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
+
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 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)
+  TITLE:=MediaTek MT76x2/MT7603 wireless driver
+  DEPENDS:= \
+       +kmod-mac80211 @PCI_SUPPORT @!LINUX_3_18 \
+       +@DRIVER_11AC_SUPPORT +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT
+  FILES:=\
+       $(PKG_BUILD_DIR)/mt76.ko \
+       $(PKG_BUILD_DIR)/mt76x2e.ko \
+       $(PKG_BUILD_DIR)/mt7603e.ko
+  AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e mt7603e)
 endef
 
 NOSTDINC_FLAGS = \
@@ -33,8 +39,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 +57,16 @@ 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 \
+               $(if $(CONFIG_TARGET_ramips_mt7628) || $(CONFIG_TARGET_ramips_mt7688), \
+                       $(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
+                       $(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
+               ) \
+               $(PKG_BUILD_DIR)/firmware/mt7603_e1.bin \
+               $(PKG_BUILD_DIR)/firmware/mt7603_e2.bin \
+               $(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
+               $(PKG_BUILD_DIR)/firmware/mt7662.bin \
+               $(1)/lib/firmware
 endef
 
 $(eval $(call KernelPackage,mt76))