From patchwork Mon Sep 14 07:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DENG Qingfang X-Patchwork-Id: 1363541 X-Patchwork-Delegate: gch981213@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mail2.sysu.edu.cn Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=AA9nAxgf; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=M5AFMQga; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BqlQn25wjz9sPB for ; Mon, 14 Sep 2020 22:04:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FU65G3fubtUlFcr6A6Ap/mUuAXoOxrhiL4MUDyy7RmA=; b=AA9nAxgf5a0UMJksAJtipNZfhp GvtcI2YsIO/xanNZCe/qZxj5mtIRA2W9lP9MRGxCIDUlpeot+jdYyiRGULrnGjPHTgli6IwADZHwB KoikSkfpBLvsXi7tzJPXepnp4yoFp0od0NyXl/6Zt/vYeizOZnUA5tqFe1vaphi9jZkzcN1Y4ptns WdCsCRZBsM+oJlqHrbGQsf26GV87PbjimWScjqfapGKY7aQhcUEBup9tldKogkodrSiL1qqV4RwMC +COYrOOf20tcMfCNKcXph2NdBW44dZ9omLfy0UCudmPKEUJS/RRE7f0Zt96UgJ6SwV8dx812fgBcp BWSlNkEA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHnAt-0001b3-9x; Mon, 14 Sep 2020 12:01:35 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHnAm-0001Yr-7p for openwrt-devel@merlin.infradead.org; Mon, 14 Sep 2020 12:01:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=xm8WVgoeLK+OhEUQzJXfHasd+SndirNCTQTYhFJCYeQ=; b=M5AFMQgayP4aHHXfHGHiUOk4uH xi/O9b2gV4b2radR/AMVUQj1G4FNAhJUKpPvNA9N5rf3E+CUm2XBHfyhR8SUhguXdNImyT2oE/Z2h AlKZ0+rnpJnQs/q8nY/h2r5cnspLm22PFkdRhUebMe0JE8F9vrxUD4d183D1Ns0ZZbKHX4xevQ7ac xssx6vnh2XHQwyZdqX1xy9hwaNkPYwJcuLiz3F1QdsZB6zuWKLjTMe4ABqVgOKC4pPwgunsA9o7WT iQyopHqPNm2PtJD3sA8Idmz+t6tTb7roQgZYw0AW+chK/oy15vuroEbrAifEDfs9nyeemLdqhhpYL nSXhcfxg==; Received: from smtpbg702.qq.com ([203.205.195.102] helo=smtpproxy21.qq.com) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHiYi-0006ar-Bb for openwrt-devel@lists.openwrt.org; Mon, 14 Sep 2020 07:05:58 +0000 X-QQ-mid: bizesmtp4t1600067115t876q0mes Received: from localhost.localdomain (unknown [171.211.26.29]) by esmtp6.qq.com (ESMTP) with id ; Mon, 14 Sep 2020 15:05:14 +0800 (CST) X-QQ-SSF: 0140000000700080J000B00A0000000 X-QQ-FEAT: mJep2VbaKxYL/fukkS1tth1g9odYZzg8hV/SlW8fsOVfsxeGxN46+wyOoxIBM MmRoILZCs/Xm4Io/xQoyjKmmhl6EPeklyRX5/j+D89z07FhfFaNsNxUK4M4H/orHTbGD9I+ UcpPc+IJjtWae2o72zsY3LrkSNlhc3KMpZOz43kmHbrRT3bTjxcQZ+/vpgHR4e+rdzlgDk7 py+ToX0VedNZkrBEAJAVAgDDtvZKkB4CFftz+1adFVi9Y+0jXgJqnzPoOSDulMV8umjYOiK omGWqGTPlf2q5a8XnN/QbE2ip25XPZ+4rGEvhe2MaXszkaMHljGb2te//4NdRWulXS2USTq oLJVbs6MT4dHz4im7U= X-QQ-GoodBg: 2 From: DENG Qingfang To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mt76: move mt7615/7663 firmware to firmware section Date: Mon, 14 Sep 2020 15:05:03 +0800 Message-Id: <20200914070503.57889-1-dengqf6@mail2.sysu.edu.cn> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:mail2.sysu.edu.cn:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200914_080552_806981_5E8000AE X-CRM114-Status: UNSURE ( 8.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.4 (/) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [203.205.195.102 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [203.205.195.102 listed in list.dnswl.org] 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [171.211.26.29 listed in dnsbl.sorbs.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felix Fietkau Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Move the separate mt76 firmware packages to firmware section Signed-off-by: DENG Qingfang --- package/kernel/mt76/Makefile | 78 ++++++++++++++------------ target/linux/mediatek/image/mt7622.mk | 4 +- target/linux/mediatek/mt7622/target.mk | 2 +- target/linux/ramips/image/mt7621.mk | 70 +++++++++++------------ 4 files changed, 80 insertions(+), 74 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 84a59b7e08..3b201ef9f1 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -150,12 +150,6 @@ define KernelPackage/mt7615-common FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko endef -define KernelPackage/mt7615-firmware - $(KernelPackage/mt76-default) - TITLE:=MediaTek MT7615e firmware - DEFAULT:=PACKAGE_kmod-mt7615e -endef - define KernelPackage/mt7615e $(KernelPackage/mt76-default) TITLE:=MediaTek MT7615e wireless driver @@ -164,16 +158,6 @@ define KernelPackage/mt7615e AUTOLOAD:=$(call AutoProbe,mt7615e) endef -define KernelPackage/mt7663-firmware-ap - $(KernelPackage/mt76-default) - TITLE:=MediaTek MT7663e firmware (optimized for AP) -endef - -define KernelPackage/mt7663-firmware-sta - $(KernelPackage/mt76-default) - TITLE:=MediaTek MT7663e firmware (client mode offload) -endef - define KernelPackage/mt7663-usb-sdio $(KernelPackage/mt76-default) TITLE:=MediaTek MT7663 USB/SDIO shared code @@ -216,6 +200,28 @@ define Package/mt76-test DEPENDS:=kmod-mt76-core +libnl-tiny endef +define Package/mt76-firmware-default + SECTION:=firmware + CATEGORY:=Firmware + PKGARCH:=all +endef + +define Package/mt7615-firmware + $(Package/mt76-firmware-default) + TITLE:=MediaTek MT7615e firmware + DEFAULT:=PACKAGE_kmod-mt7615e +endef + +define Package/mt7663-firmware-ap + $(Package/mt76-firmware-default) + TITLE:=MediaTek MT7663e firmware (optimized for AP) +endef + +define Package/mt7663-firmware-sta + $(Package/mt76-firmware-default) + TITLE:=MediaTek MT7663e firmware (client mode offload) +endef + TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny NOSTDINC_FLAGS = \ @@ -346,7 +352,21 @@ define KernelPackage/mt7603/install $(1)/lib/firmware endef -define KernelPackage/mt7615-firmware/install +define KernelPackage/mt7915e/install + $(INSTALL_DIR) $(1)/lib/firmware/mediatek + cp \ + $(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \ + $(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \ + $(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \ + $(1)/lib/firmware/mediatek +endef + +define Package/mt76-test/install + mkdir -p $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin +endef + +define Package/mt7615-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/mediatek cp \ $(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \ @@ -358,7 +378,7 @@ define KernelPackage/mt7615-firmware/install $(1)/lib/firmware/mediatek endef -define KernelPackage/mt7663-firmware-ap/install +define Package/mt7663-firmware-ap/install $(INSTALL_DIR) $(1)/lib/firmware/mediatek cp \ $(PKG_BUILD_DIR)/firmware/mt7663_n9_rebb.bin \ @@ -366,7 +386,7 @@ define KernelPackage/mt7663-firmware-ap/install $(1)/lib/firmware/mediatek endef -define KernelPackage/mt7663-firmware-sta/install +define Package/mt7663-firmware-sta/install $(INSTALL_DIR) $(1)/lib/firmware/mediatek cp \ $(PKG_BUILD_DIR)/firmware/mt7663_n9_v3.bin \ @@ -374,20 +394,6 @@ define KernelPackage/mt7663-firmware-sta/install $(1)/lib/firmware/mediatek endef -define KernelPackage/mt7915e/install - $(INSTALL_DIR) $(1)/lib/firmware/mediatek - cp \ - $(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \ - $(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \ - $(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \ - $(1)/lib/firmware/mediatek -endef - -define Package/mt76-test/install - mkdir -p $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin -endef - $(eval $(call KernelPackage,mt76-core)) $(eval $(call KernelPackage,mt76-usb)) $(eval $(call KernelPackage,mt76x02-usb)) @@ -400,13 +406,13 @@ $(eval $(call KernelPackage,mt76x2u)) $(eval $(call KernelPackage,mt76x2)) $(eval $(call KernelPackage,mt7603)) $(eval $(call KernelPackage,mt7615-common)) -$(eval $(call KernelPackage,mt7615-firmware)) $(eval $(call KernelPackage,mt7615e)) -$(eval $(call KernelPackage,mt7663-firmware-ap)) -$(eval $(call KernelPackage,mt7663-firmware-sta)) $(eval $(call KernelPackage,mt7663-usb-sdio)) $(eval $(call KernelPackage,mt7663u)) $(eval $(call KernelPackage,mt7663s)) $(eval $(call KernelPackage,mt7915e)) $(eval $(call KernelPackage,mt76)) $(eval $(call BuildPackage,mt76-test)) +$(eval $(call BuildPackage,mt7615-firmware)) +$(eval $(call BuildPackage,mt7663-firmware-ap)) +$(eval $(call BuildPackage,mt7663-firmware-sta)) diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index dee340accf..7f4a0b4ee4 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -27,8 +27,8 @@ define Device/elecom_wrc-2533gent DEVICE_MODEL := WRC-2533GENT DEVICE_DTS := mt7622-elecom-wrc-2533gent DEVICE_DTS_DIR := $(DTS_DIR)/mediatek - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 kmod-mt7615e \ - kmod-mt7615-firmware mt7622bt-firmware swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 mt7622bt-firmware \ + swconfig endef TARGET_DEVICES += elecom_wrc-2533gent diff --git a/target/linux/mediatek/mt7622/target.mk b/target/linux/mediatek/mt7622/target.mk index cb5a6b48cd..26c32083c5 100644 --- a/target/linux/mediatek/mt7622/target.mk +++ b/target/linux/mediatek/mt7622/target.mk @@ -2,7 +2,7 @@ ARCH:=aarch64 SUBTARGET:=mt7622 BOARDNAME:=MT7622 CPU_TYPE:=cortex-a53 -DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic-wolfssl +DEFAULT_PACKAGES += kmod-mt7615e mt7615-firmware wpad-basic-wolfssl KERNELNAME:=Image dtbs define Target/Description diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 4633aff080..ef8c8de536 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -115,7 +115,7 @@ define Device/adslr_g7 IMAGE_SIZE := 16064k DEVICE_VENDOR := ADSLR DEVICE_MODEL := G7 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += adslr_g7 @@ -181,7 +181,7 @@ define Device/asus_rt-ac65p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware uboot-envtools + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e mt7615-firmware uboot-envtools endef TARGET_DEVICES += asus_rt-ac65p @@ -198,7 +198,7 @@ define Device/asus_rt-ac85p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware uboot-envtools + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e mt7615-firmware uboot-envtools endef TARGET_DEVICES += asus_rt-ac85p @@ -223,7 +223,7 @@ define Device/buffalo_wsr-2533dhpl DEVICE_ALT0_VENDOR := Buffalo DEVICE_ALT0_MODEL := WSR-2533DHP IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += buffalo_wsr-2533dhpl @@ -241,7 +241,7 @@ define Device/dlink_dir-8xx-a1 $(Device/dsa-migration) IMAGE_SIZE := 16000k DEVICE_VENDOR := D-Link - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96 IMAGES += factory.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\ @@ -258,7 +258,7 @@ define Device/dlink_dir-xx60-a1 IMAGE_SIZE := 40960k UBINIZE_OPTS := -E 5 DEVICE_VENDOR := D-Link - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \ + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 \ kmod-usb-ledtrig-usbport KERNEL := $$(KERNEL) | uimage-padhdr 96 IMAGES += factory.bin @@ -353,7 +353,7 @@ define Device/edimax_ra21s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020040 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += edimax_ra21s @@ -372,7 +372,7 @@ define Device/edimax_re23s IMAGE/factory.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN76 -f 0x70000 -S 0x01100000 | pad-rootfs | \ check-size - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += edimax_re23s @@ -385,7 +385,7 @@ define Device/edimax_rg21s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 02020038 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += edimax_rg21s @@ -397,7 +397,7 @@ define Device/elecom_wrc-1167ghbk2-s IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-wrc-factory WRC-1167GHBK2-S 0.00 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += elecom_wrc-1167ghbk2-s @@ -408,7 +408,7 @@ define Device/elecom_wrc-gs IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elecom-wrc-gs-factory $$$$(ELECOM_HWNAME) 0.00 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef define Device/elecom_wrc-1750gs @@ -545,7 +545,7 @@ define Device/iodata_wn-ax1167gr2 DEVICE_MODEL := WN-AX1167GR2 KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += iodata_wn-ax1167gr2 @@ -555,7 +555,7 @@ define Device/iodata_wn-ax2033gr DEVICE_MODEL := WN-AX2033GR KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += iodata_wn-ax2033gr @@ -565,7 +565,7 @@ define Device/iodata_wn-dx1167r DEVICE_MODEL := WN-DX1167R KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += iodata_wn-dx1167r @@ -588,7 +588,7 @@ define Device/iodata_wnpr2600g IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ elx-header 0104003a 8844A2D168B45A2D - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += iodata_wnpr2600g @@ -598,7 +598,7 @@ define Device/iptime_a6ns-m UIMAGE_NAME := a6nm DEVICE_VENDOR := ipTIME DEVICE_MODEL := A6ns-M - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \ + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 \ kmod-usb-ledtrig-usbport endef TARGET_DEVICES += iptime_a6ns-m @@ -609,7 +609,7 @@ define Device/iptime_a8004t UIMAGE_NAME := a8004t DEVICE_VENDOR := ipTIME DEVICE_MODEL := A8004T - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 endef TARGET_DEVICES += iptime_a8004t @@ -621,7 +621,7 @@ define Device/jcg_jhr-ac876m JCG_MAXSIZE := 16064k DEVICE_VENDOR := JCG DEVICE_MODEL := JHR-AC876M - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \ + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 \ kmod-usb-ledtrig-usbport endef TARGET_DEVICES += jcg_jhr-ac876m @@ -655,7 +655,7 @@ define Device/linksys_ea7xxx KERNEL_SIZE := 4096k IMAGE_SIZE := 36864k DEVICE_VENDOR := Linksys - DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e kmod-mt7615-firmware \ + DEVICE_PACKAGES := kmod-usb3 kmod-mt7615e mt7615-firmware \ uboot-envtools UBINIZE_OPTS := -E 5 IMAGES := sysupgrade.bin factory.bin @@ -828,7 +828,7 @@ define Device/netgear_r6260 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_r6260 @@ -840,7 +840,7 @@ define Device/netgear_r6350 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_r6350 @@ -859,7 +859,7 @@ define Device/netgear_r6700-v2 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x1032 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_r6700-v2 @@ -871,7 +871,7 @@ define Device/netgear_r6800 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0062 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_r6800 @@ -883,7 +883,7 @@ define Device/netgear_r6850 SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0052 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_r6850 @@ -907,7 +907,7 @@ define Device/netgear_wac124 SERCOMM_HWVER := A003 SERCOMM_SWVER := 0x0402 IMAGE_SIZE := 40960k - DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += netgear_wac124 @@ -957,7 +957,7 @@ define Device/phicomm_k2p DEVICE_ALT0_VENDOR := Phicomm DEVICE_ALT0_MODEL := KE 2P SUPPORTED_DEVICES += k2p - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += phicomm_k2p @@ -1019,7 +1019,7 @@ define Device/totolink_a7000r UIMAGE_NAME := C8340R1C-9999 DEVICE_VENDOR := TOTOLINK DEVICE_MODEL := A7000R - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += totolink_a7000r @@ -1040,7 +1040,7 @@ define Device/tplink_re500-v1 $(Device/tplink-safeloader) DEVICE_MODEL := RE500 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware TPLINK_BOARD_ID := RE500-V1 IMAGE_SIZE := 14208k endef @@ -1051,7 +1051,7 @@ define Device/tplink_re650-v1 $(Device/tplink-safeloader) DEVICE_MODEL := RE650 DEVICE_VARIANT := v1 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware TPLINK_BOARD_ID := RE650-V1 IMAGE_SIZE := 14208k endef @@ -1061,7 +1061,7 @@ define Device/tplink_tl-wdr8620-v3 DEVICE_VENDOR := TP-Link DEVICE_MODEL := TL-WDR8620 DEVICE_VARIANT := v3 - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 IMAGE_SIZE := 16128k endef TARGET_DEVICES += tplink_tl-wdr8620-v3 @@ -1098,7 +1098,7 @@ define Device/ubnt_unifi-nanohd $(Device/dsa-migration) DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := UniFi nanoHD - DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615e mt7615-firmware IMAGE_SIZE := 15552k endef TARGET_DEVICES += ubnt_unifi-nanohd @@ -1129,7 +1129,7 @@ define Device/wavlink_wl-wn531a6 $(Device/dsa-migration) DEVICE_VENDOR := Wavlink DEVICE_MODEL := WL-WN531A6 - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware kmod-usb3 + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e mt7615-firmware kmod-usb3 IMAGE_SIZE := 15040k endef TARGET_DEVICES += wavlink_wl-wn531a6 @@ -1168,7 +1168,7 @@ define Device/winstars_ws-wn583a6 DEVICE_ALT0_VENDOR := Gemeita DEVICE_ALT0_MODEL := AC2100 KERNEL_INITRAMFS_SUFFIX := -WN583A6$$(KERNEL_SUFFIX) - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e mt7615-firmware endef TARGET_DEVICES += winstars_ws-wn583a6 @@ -1185,7 +1185,7 @@ define Device/xiaomi-ac2100 IMAGE/rootfs0.bin := append-ubi | check-size IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Xiaomi - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware \ + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e mt7615-firmware \ uboot-envtools endef @@ -1246,7 +1246,7 @@ define Device/xiaomi_mir3p IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \ + DEVICE_PACKAGES := kmod-mt7615e mt7615-firmware kmod-usb3 \ kmod-usb-ledtrig-usbport uboot-envtools endef TARGET_DEVICES += xiaomi_mir3p