X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmt76%2FMakefile;h=8338d3aab6328024025c42ed097f50ea3e854cad;hb=583d65ebfe04dee73d84a68efe3b0bc7e242127c;hp=49d459623c6cebcaa116e37ee71bc4e5c7a06767;hpb=d51cbefe86c230f708b9c766d6f6d2ffe5074215;p=oweals%2Fopenwrt.git

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 49d459623c..8338d3aab6 100644
--- 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:=2018-10-05
-PKG_SOURCE_VERSION:=d533f1351834ba2899897b090aa56a5f5b922bd7
-PKG_MIRROR_HASH:=27e9c4cf876ad26a6f854d2b00d7e3b100980e820444f13986bf66f3f539eed3
+PKG_SOURCE_DATE:=2018-12-04
+PKG_SOURCE_VERSION:=da00af00c503250ef8e7d1da74a123191def2893
+PKG_MIRROR_HASH:=81b247a270315ae7a235443a1d55975335fb5eaddbc6df0c3ba4395f8ef8caa6
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -33,7 +33,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/mt76-default
   SUBMENU:=Wireless Drivers
   DEPENDS:= \
-	+kmod-mac80211 @PCI_SUPPORT @!LINUX_3_18 \
+	+kmod-mac80211 @!LINUX_3_18 \
 	+@DRIVER_11AC_SUPPORT +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT
 endef
 
@@ -47,6 +47,7 @@ endef
 define KernelPackage/mt76-core
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT76xx wireless driver
+  HIDDEN:=1
   FILES:=\
 	$(PKG_BUILD_DIR)/mt76.ko
 endef
@@ -54,7 +55,7 @@ endef
 define KernelPackage/mt76-usb
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT76xx wireless driver USB support
-  DEPENDS += kmod-usb-core kmod-mt76-core
+  DEPENDS += +kmod-usb-core +kmod-mt76-core
   HIDDEN:=1
   FILES:=\
 	$(PKG_BUILD_DIR)/mt76-usb.ko
@@ -84,9 +85,18 @@ define KernelPackage/mt76x0-common
   FILES:=$(PKG_BUILD_DIR)/mt76x0/mt76x0-common.ko
 endef
 
+define KernelPackage/mt76x0e
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT76x0E wireless driver
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76x0-common
+  FILES:=\
+	$(PKG_BUILD_DIR)/mt76x0/mt76x0e.ko
+  AUTOLOAD:=$(call AutoProbe,mt76x0e)
+endef
+
 define KernelPackage/mt76x0u
   $(KernelPackage/mt76-default)
-  TITLE:=MediaTek MT76x2U wireless driver
+  TITLE:=MediaTek MT76x0U wireless driver
   DEPENDS+=+kmod-mt76x0-common +kmod-mt76x02-usb
   FILES:=\
 	$(PKG_BUILD_DIR)/mt76x0/mt76x0u.ko
@@ -113,7 +123,7 @@ endef
 define KernelPackage/mt76x2
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT76x2 wireless driver
-  DEPENDS+=+kmod-mt76x2-common
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76x2-common
   FILES:=\
 	$(PKG_BUILD_DIR)/mt76x2/mt76x2e.ko
   AUTOLOAD:=$(call AutoProbe,mt76x2e)
@@ -122,7 +132,7 @@ endef
 define KernelPackage/mt7603
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7603 wireless driver
-  DEPENDS+=+kmod-mt76-core
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core
   FILES:=\
 	$(PKG_BUILD_DIR)/mt7603/mt7603e.ko
   AUTOLOAD:=$(call AutoProbe,mt7603e)
@@ -153,6 +163,9 @@ endif
 ifdef CONFIG_PACKAGE_kmod-mt76x0-common
   PKG_MAKE_FLAGS += CONFIG_MT76x0_COMMON=m
 endif
+ifdef CONFIG_PACKAGE_kmod-mt76x0e
+  PKG_MAKE_FLAGS += CONFIG_MT76x0E=m
+endif
 ifdef CONFIG_PACKAGE_kmod-mt76x0u
   PKG_MAKE_FLAGS += CONFIG_MT76x0U=m
 endif
@@ -182,7 +195,14 @@ define Package/kmod-mt76/install
 	true
 endef
 
-define KernelPackage/mt76x2/install
+define KernelPackage/mt76x0-common/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
+	cp \
+		$(PKG_BUILD_DIR)/firmware/mt7610e.bin \
+		$(1)/lib/firmware/mediatek
+endef
+
+define KernelPackage/mt76x2-common/install
 	$(INSTALL_DIR) $(1)/lib/firmware
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
@@ -190,6 +210,17 @@ define KernelPackage/mt76x2/install
 		$(1)/lib/firmware
 endef
 
+define KernelPackage/mt76x0u/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
+	ln -sf mt7610e.bin $(1)/lib/firmware/mediatek/mt7610u.bin
+endef
+
+define KernelPackage/mt76x2u/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
+	ln -sf ../mt7662.bin $(1)/lib/firmware/mediatek/mt7662u.bin
+	ln -sf ../mt7662_rom_patch.bin $(1)/lib/firmware/mediatek/mt7662u_rom_patch.bin
+endef
+
 define KernelPackage/mt7603/install
 	$(INSTALL_DIR) $(1)/lib/firmware
 	cp $(if $(CONFIG_TARGET_ramips_mt76x8), \
@@ -207,6 +238,7 @@ $(eval $(call KernelPackage,mt76-usb))
 $(eval $(call KernelPackage,mt76x02-usb))
 $(eval $(call KernelPackage,mt76x02-common))
 $(eval $(call KernelPackage,mt76x0-common))
+$(eval $(call KernelPackage,mt76x0e))
 $(eval $(call KernelPackage,mt76x0u))
 $(eval $(call KernelPackage,mt76x2-common))
 $(eval $(call KernelPackage,mt76x2u))