From nobody Sat Feb 7 00:58:21 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHx34Vbz6Qrr9 for ; Sat, 07 Feb 2026 00:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CHx2JRTz3LxF for ; Sat, 07 Feb 2026 00:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6aIiNd28tU7gs79iT2w8mgmjvdSFX2Vfxl49hzAZIuI=; b=kYSjDRq2fvA6wl1A4oE/eI886dQVA8WZfyNIeYw9lZlmbs2qMy5E+mcEuVh/7AAR0GBJtT ihtC5ELlq5CpiedRSBObB0Rnima46IGKltMpoZnMeK/O5zNdad4650fAAZAcqxMLXyzai6 7W++V3XXFte6Re5qac0ctYQxoXZESzy2pZEOGMX8FXNLE7IoKwLTR7TP3i/tbmfui+1RHI 7ngtWetIC6L4MKKlPkQlmhFHk4qszuR1GHqKfJPuiG+LelJzHLvBl2ONz4qRYI5LpkDhui sSR8A8FUH11U+taYD+YWEwV8Y2p3CKol9FpjhMwg7FOWtWmxOULQ1G5o9A0kpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425901; a=rsa-sha256; cv=none; b=huwFcch4hF4+WgFCBIx828b5ygiOBZj8kQACZSD6aoGGq5CWEJx3MXy7pvlp7fClyvYu2r Tbeg2DHCrkYQYwQqZqAY55eZeHdWTDv0OQ50AQxAF7h/PlIHmAuyhXh05ynTIirIE0vKcN jnFYcsUunu6L7w0bIj2qasosjWpP8lA7Uo45cgUdCud1NlqdtaGezReL+QZnA31xo3H9pD LTdaC8FjjWuxcufIMpOTbYjR/G06rU4Oawew56sx1ergS32GE3KujmuVg2G7Fv6ZbtXefh 2j1CcarUi5wUfPdFnQ4xh3aYaC6TaAuaKOWwOOePaVN980a2+ibrUp+w80k4Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6aIiNd28tU7gs79iT2w8mgmjvdSFX2Vfxl49hzAZIuI=; b=Z7/U1ndh5akZehBGuJ8dVq8xH+qhuwoh3seHVRe3DT2D8y5oRPXnzE2FoO/O08WkbQO29q WwAPslAULG6hd4i8SZ7w155wRB4tGbuMVFpOL+2BMBi4QbtSHUwg+tlt/F6nSjKp12oMDZ tYkwRRIkjWkGlzKSU7bYEF2PPo1OGDrLcB91+WyA9HOHOOgEeY2CxlRueDxRi1HPCMuTtS KhGFbz+Ri9kY8gW15XISSr3tB+madlqSmTYlAy/by/PU9TvrpUqJ3KQZzRoC5kY78emHcc ekDBl44fb7QdWiOIVdhtCzk8bA8IVH9ilcn5rIZMS06/6m8rY9FE8mdwDXyjUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHx1d1kzgGn for ; Sat, 07 Feb 2026 00:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 323e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 201fc8a55a48 - main - mt76: sort bus attachments in module Makefiles for pci and usb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 201fc8a55a4832174b5943e17ac90800aebe5772 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:21 +0000 Message-Id: <69868e2d.323e5.1406dd34@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=201fc8a55a4832174b5943e17ac90800aebe5772 commit 201fc8a55a4832174b5943e17ac90800aebe5772 Author: Bjoern A. Zeeb AuthorDate: 2026-02-02 01:23:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-07 00:57:50 +0000 mt76: sort bus attachments in module Makefiles for pci and usb With PCI enabled and USB still disabled add knobs to (i) enabled them manually in the common Makefile.inc and (ii) add bus attachment depend knobs where needed to enable them in individual drivers. For now the focus is in 7921 and 7925. Sponsored by: The FreeBSD Foundation MFC atfer: 3 days --- sys/modules/mt76/Makefile.inc | 6 ++++++ sys/modules/mt76/core/Makefile | 7 +++++++ sys/modules/mt76/mt7921/Makefile | 18 +++++++++++++----- sys/modules/mt76/mt7925/Makefile | 12 +++++++++--- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index e4369564237e..739c85c60dac 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -4,6 +4,12 @@ COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 .PATH: ${COMMONDIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 +WITH_SDIO= 0 + +# Options. WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 WITH_SOC_WED= 0 diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index c782bf218d93..589063a23229 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,3 +1,5 @@ +.include + KMOD= mt76_core # Basic stuff. @@ -6,10 +8,15 @@ SRCS+= channel.c scan.c wed.c #SRCS+= trace.c # Bus stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c +.endif + .if defined(WITH_USB) && ${WITH_USB} > 0 SRCS+= usb.c # usb_trace.c .endif + #SRCS+= sdio.c sdio_txrx.c # Connac-Lib stuff. diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index d3f201997a2d..1b53df04357c 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -1,3 +1,5 @@ +.include + DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7921 .PATH: ${DEVDIR} @@ -7,14 +9,20 @@ KMOD= if_mt7921 # Common stuff. SRCS= init.c main.c mac.c mcu.c -# PCI stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c pci_mac.c pci_mcu.c +.endif -# USB stuff. -#SRCS+= usb.c +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif -# SDIO stuff. -#SRCS+= sdio.c sdio_mac.c sdio_mcu.c +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +SRCS+= sdio.c sdio_mac.c sdio_mcu.c +.endif .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= debugfs.c diff --git a/sys/modules/mt76/mt7925/Makefile b/sys/modules/mt76/mt7925/Makefile index dc6de5085d77..ee79f09dba1c 100644 --- a/sys/modules/mt76/mt7925/Makefile +++ b/sys/modules/mt76/mt7925/Makefile @@ -1,3 +1,5 @@ +.include + DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7925 .PATH: ${DEVDIR} @@ -7,11 +9,15 @@ KMOD= if_mt7925 # Common stuff. SRCS= init.c main.c mac.c mcu.c regd.c -# PCI stuff. +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c pci_mac.c pci_mcu.c +.endif -# USB stuff. -#SRCS+= usb.c +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= debugfs.c