mt76: update to the latest version, reverts MAC address changes causing performance...

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

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 5e7761093cf6dcf250f1aa48bbda7b868301d0e6..441f59e43eb0cb8e19fbdbef07db86d200412fd0 100644 (file)
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2017-01-31
-PKG_SOURCE_VERSION:=3c8caafc5e150db79f714b958a51cee8f242f309
-PKG_MIRROR_HASH:=c03c166466cb7ea825e52cd085511045e3847d927ba2bde2b8fb46595a3ed13a
+PKG_SOURCE_DATE:=2017-12-17
+PKG_SOURCE_VERSION:=68b0cf17efe32623efd2a46d33b0b551bb78cbbe
+PKG_MIRROR_HASH:=855901e5e02249f53bb943d2d5da5bb3cb357f02e4c68c6291604867e250e9bd
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -20,17 +20,43 @@ STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backpor
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/mt76
+define KernelPackage/mt76-default
   SUBMENU:=Wireless Drivers
-  TITLE:=MediaTek MT76x2/MT7603 wireless driver
   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 (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
+endef
+
+define KernelPackage/mt76x2
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT76x2 wireless driver
+  DEPENDS+=+kmod-mt76-core
+  FILES:=\
+       $(PKG_BUILD_DIR)/mt76x2e.ko
+  AUTOLOAD:=$(call AutoProbe,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 AutoProbe,mt7603e)
 endef
 
 NOSTDINC_FLAGS = \
@@ -48,25 +74,37 @@ endif
 
 define Build/Compile
        +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-               ARCH="$(LINUX_KARCH)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
+               $(KERNEL_MAKE_FLAGS) \
                SUBDIRS="$(PKG_BUILD_DIR)" \
                NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
                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_mt76x8), \
+               $(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))