From nobody Sat Apr 25 16:23:09 2026 X-Original-To: dev-commits-src-branches@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 4g2w9T33Lrz6blQv for ; Sat, 25 Apr 2026 16:23:09 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2w9T1dZcz41dN for ; Sat, 25 Apr 2026 16:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134189; 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=VSIyEuOPoqebKKzcEQBWO/aW+WTlPjRdqo+Yu7LujoA=; b=e+siFvnBqRr8IRPsClbkXFK/xg3Cm3fURjXzjJxMF2VJ3mW1fugVxIrXfn7BaBGchT2KjE mNkv0XAgoSnw0MPK1/igacYVAgra+m/LVF6REc4LltDxG+FTpSnDHu8dIrRQNbFojfH6nn Z7TYXESnVDYdYZi92Byxu62NG6e9xvVZvHbU9zCY+FxhIosihbjWbq7/yOLQbQdyGUtZdy DsIG0I22h31ZTE5Gws7eWH0pAnEXPMHtJDEL8OGCH4Vwnxh5bMyqbZAaIJrb+25feu/uBQ rU0Mir5+hCXmchNVG+eiu5UzL8ruEn2oTTvrOnY08UB4kY1jp8BZBQCIgC9xzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134189; a=rsa-sha256; cv=none; b=nOx/zjVllqItxkVCgSvzeDmjz0yMMR0/NIhXSpFB+EbhNjrIL4ZsrS2oIkh3VSfoy+xhyf Y4q5lT5hjDRBfQv0lZ2D6oJsqy2tZRd2wN1LBs0p+WCseaLngLiGQrLoABUtiWw0yBbxPK BkF2LW99TenRiLRIgGxXVzBGztzVeaylvLbXcP6eDE70zdZdPq4bhn6b9rG8E7rrTxZeQZ zv48SdjpwPYgbsqFDFPdEY6btsbd4rSl7zxpTVJw6yUXqYZPvh3oEC0Wt8ELp8iYltWPw1 O4h7TYOly+nG028Ds7yI6XOdc/a/OwPoeusoYCyWEiMsKwPv8xl+l35Ipmxyow== 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=1777134189; 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=VSIyEuOPoqebKKzcEQBWO/aW+WTlPjRdqo+Yu7LujoA=; b=nFjDHZkNvB3t5c0rMGp8u0C9JpWSmlHdJwnmg0uv7ql+KI44wuqagONKbHNliNtKwL/11N GwVMiljzyaqsHXgtzWMldWyImv+lcyc3c1iDI3BCSbfcGPHIVMfkUA8E+o/TNgyPXFXiBp gI/lCpS5iwJSiSdzRyRNdM7m2hNLSbNqyNe7vi5PsvtKWc7pZkkVc9cp4Lz1A0Pco5U7SN Ey652fP35CEcjcYEvoo99cuxHhD/LVIhiiGH+2VGHt/12sWCrmxcJgPSrx6YHE/TWqWpAo Wvh1q2HWFLzy2DkjQ8bWG77O7HWgZmbgeZ9utr6Ji43e0VZs7lAGNp7woqFl3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2w9T0hk7zh0k for ; Sat, 25 Apr 2026 16:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42656 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:23:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 253d17af2e6a - stable/15 - Only build USB-related modules if MK_USB != no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 253d17af2e6ac2254d8939dd34659d1c269bcbaf Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:23:09 +0000 Message-Id: <69ecea6d.42656.6429388a@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=253d17af2e6ac2254d8939dd34659d1c269bcbaf commit 253d17af2e6ac2254d8939dd34659d1c269bcbaf Author: Enji Cooper AuthorDate: 2026-03-03 04:49:54 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:23:04 +0000 Only build USB-related modules if MK_USB != no This change moves the thunderbolt module and other USB modules under a MK_USB != no conditional to ensure that users not desiring USB support can easily build systems without USB-specific drivers using this knob. MFC after: 1 week Reviewed By: imp Differential Revision: https://reviews.freebsd.org/D55576 (cherry picked from commit c47cefba831240a1b3de375f18134b93cf998f5c) --- sys/conf/kern.opts.mk | 5 +++++ sys/conf/kmod.mk | 8 ++++++-- sys/modules/Makefile | 12 ++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 045e55d1b19a..7daac67f8077 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -51,6 +51,7 @@ __DEFAULT_YES_OPTIONS = \ SOURCELESS_UCODE \ SPLIT_KERNEL_DEBUG \ TESTS \ + USB \ USB_GADGET_EXAMPLES \ ZFS @@ -210,6 +211,10 @@ MK_KERNEL_SYMBOLS:= no MK_DTRACE:= no .endif +.if ${MK_USB} == "no" +MK_USB_GADGET_EXAMPLES:= no +.endif + # Some modules only compile successfully if option FDT is set, due to #ifdef FDT # wrapped around declarations. Module makefiles can optionally compile such # things using .if !empty(OPT_FDT) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 00335f24e2e4..b5e30d48fff1 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -103,10 +103,14 @@ LINUXKPI_GENSRCS+= \ pci_iov_if.h \ pcib_if.h \ vnode_if.h \ - usb_if.h \ - opt_usb.h \ opt_stack.h +.if ${MK_USB} != "no" +LINUXKPI_GENSRCS+= \ + usb_if.h \ + opt_usb.h +.endif + LINUXKPI_INCLUDES+= \ -I${SYSDIR}/compat/linuxkpi/common/include \ -I${SYSDIR}/compat/linuxkpi/dummy/include \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index cb18bb07b8ab..a3b0cda92feb 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -356,7 +356,7 @@ SUBDIR= \ ${_rtw89} \ rtwn \ rtwn_pci \ - rtwn_usb \ + ${_rtwn_usb} \ ${_rtwnfw} \ ${_s3} \ ${_safe} \ @@ -409,7 +409,7 @@ SUBDIR= \ ${_ufshci} \ uinput \ unionfs \ - usb \ + ${_usb} \ ${_vesa} \ ${_vf_i2c} \ virtio \ @@ -704,6 +704,14 @@ SUBDIR+= ktest SUBDIR+= tests .endif +.if ${MK_USB} != "no" || defined(ALL_MODULES) +_rtwn_usb= rtwn_usb +_usb= usb +. if ${MACHINE_CPUARCH} == "amd64" +_thunderbolt= thunderbolt +. endif +.endif + .if ${MK_ZFS} != "no" || defined(ALL_MODULES) SUBDIR+= zfs .endif