mt76: update to the latest version, fixes a mt7603 beacon issue

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

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index ee63627cf60037dd4463eebf2725c5043c8aaed0..3e8a9680c1d3805159500d497235b8abc4dc3ced 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:=2016-12-15
 PKG_RELEASE=1
 
 PKG_LICENSE:=GPLv2
@@ -9,10 +8,9 @@ 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:=7ce4368c3d508b61993466fa5a13a3b5929bde4b
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=26430cf25de1baa41ef0e2508a8d5438f82f2a3b7448905ada23280d8f9c7f6c
+PKG_SOURCE_DATE:=2017-05-30
+PKG_SOURCE_VERSION:=ef5b045ddf52d7033da5270c7a6ce195df24bd24
+PKG_MIRROR_HASH:=728fe56fda7bb5f7d97f5aefdb95c009d1ea7f1f092911d0d55af8b525f71466
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -22,15 +20,44 @@ STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backpor
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
+define KernelPackage/mt76-default
+  SUBMENU:=Wireless Drivers
+  DEPENDS:= \
+       +kmod-mac80211 @PCI_SUPPORT @!LINUX_3_18 \
+       +@DRIVER_11AC_SUPPORT +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT
+endef
+
 define KernelPackage/mt76
   SUBMENU:=Wireless Drivers
-  TITLE:=MediaTek MT76x2/MT7603 wireless driver
-  DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT @PCI_SUPPORT @!LINUX_3_18
+  TITLE:=MediaTek MT76x2/MT7603 wireless driver (metapackage)
+  DEPENDS:= \
+       +kmod-mt76-core +kmod-mt76x2 +kmod-mt7603
+endef
+
+define KernelPackage/mt76-core
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT76xx wireless driver
+  FILES:=\
+       $(PKG_BUILD_DIR)/mt76.ko
+  AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76)
+endef
+
+define KernelPackage/mt76x2
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT76x2 wireless driver
+  DEPENDS+=+kmod-mt76-core
+  FILES:=\
+       $(PKG_BUILD_DIR)/mt76x2e.ko
+  AUTOLOAD:=$(call AutoLoad,51,mt76x2e)
+endef
+
+define KernelPackage/mt7603
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7603 wireless driver
+  DEPENDS+=+kmod-mt76-core
   FILES:=\
-       $(PKG_BUILD_DIR)/mt76.ko \
-       $(PKG_BUILD_DIR)/mt76x2e.ko \
        $(PKG_BUILD_DIR)/mt7603e.ko
-  AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e mt7603e)
+  AUTOLOAD:=$(call AutoLoad,51,mt7603e)
 endef
 
 NOSTDINC_FLAGS = \
@@ -55,18 +82,31 @@ define Build/Compile
                modules
 endef
 
-define KernelPackage/mt76/install
+define Package/kmod-mt76/install
+       true
+endef
+
+define KernelPackage/mt76x2/install
        $(INSTALL_DIR) $(1)/lib/firmware
        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
 
+define KernelPackage/mt7603/install
+       $(INSTALL_DIR) $(1)/lib/firmware
+       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 \
+               ) \
+               $(1)/lib/firmware
+endef
+
+$(eval $(call KernelPackage,mt76-core))
+$(eval $(call KernelPackage,mt76x2))
+$(eval $(call KernelPackage,mt7603))
 $(eval $(call KernelPackage,mt76))