From nobody Tue Feb 10 10:16:57 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 4f9HY63Nnwz6Rq7R for ; Tue, 10 Feb 2026 10:16:58 +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 4f9HY56gjTz3L3Y for ; Tue, 10 Feb 2026 10:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718617; 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=adNCCo9tFqMgxvCUlKYb/KVhC90m7polV5tpMiqvVwU=; b=lPqTqezYp+B7+coCKG5Y5hi+2mGAb7d8ARHt4jqhg3Hl4Jiwxc8QF+YD3ZJpb1Veyo0fui pSK3xxxZbhdbtMlmGVvYT5Gr+9miN9QjCZj5aSdJjAPbB8AJarmsfx3df1266Y8GOJWg0Z Gy12EH/7qgPTEt2TGgt0Xh4QuKQHIm4ahls+TUEDdhyVJIBQgp6MZdDzVv7n6em1qHLGZi 5Obse90OkdXdANQj6nVh+TY4AQLRx+wjNQZMxheyM3S4tljl+UlEvbq3cfP7+My708yYod fP+PyXgrkiYsxGhGoWCKg8bGKbhYkzwoZVIVGYPCBXaOJq2E8Regnwv52jETvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718618; a=rsa-sha256; cv=none; b=nw8DOpMXMoWNqOvZBkU4OJAcbgMH6JQRt2FPsoSYr4rn0u4BiTpl8kZq+cr6Vf8gIXJGme ujSWvob8fnvGnXlcUJu97Sztr7PIHprbtacaj7UMZwR4xWVmhrnlD1o9ai6eDwyupKp/xK bs7AvmkJxAPXSfKByB01+bQ32GNUbO2hPdKpFKp0oRYDe/8ewZFV0h4LXcDt5E40Pz5yAR 0iGtXhc1wvtwF72VDu9WcZw79NISRqRv2dCMa+tptrSfbA2Y044BvH5o1VStEEJVzYBxhd 22TU+rjo5OZDn4sZO2aSW19BN4OjWOUqltG08EA5wjCmmdUOan1ph5Ec0V0edQ== 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=1770718617; 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=adNCCo9tFqMgxvCUlKYb/KVhC90m7polV5tpMiqvVwU=; b=krZW7MscTjWphoeiXP9x0M3I5B7aUz+1zE1e+yMxzuFP8vHwrecB1TtR3DbHd/JX4DdeUs Jb+YWZcyZuOoydvjv1G5h3cQhJlWDejvlb7ocrrgMVKCdkNOQ7wA8/+6iexlmfsxt0oF1o C3XqvYM2ybf6XjAwuZwBJb77knEM/qSZfseNiTwycbV5PQ0ObQLuCQ1vvpgVjoC77H/ZN9 4AuYm2vhpQcDkiqaqWN9OpOoOnoQJB5YyDJ+EdrYJDeH7xI/Ks9DGlbz7VBzScilQCDPkD EGm0lKBalLWbSXG/BtAOS7ubgNxdmk/m01S2gkPp0VvenYKk1EpK2fXMq6nhSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY564S8z1DTG for ; Tue, 10 Feb 2026 10:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e114 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f19cb3c72b00 - main - rtw89: module Makefile add USB bus attachments 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: f19cb3c72b001f5ca2204888bfab50e2f388547d Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:57 +0000 Message-Id: <698b0599.1e114.7c16d819@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f19cb3c72b001f5ca2204888bfab50e2f388547d commit f19cb3c72b001f5ca2204888bfab50e2f388547d Author: Bjoern A. Zeeb AuthorDate: 2026-01-31 23:16:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:35 +0000 rtw89: module Makefile add USB bus attachments Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/rtw89/Makefile | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 701e40fcb2d7..63032afa6f89 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -4,6 +4,12 @@ DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 +WITH_SDIO= 0 + +# Options. WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 .if ${KERN_OPTS:MDEV_ACPI} @@ -12,24 +18,20 @@ WITH_CONFIG_ACPI= 1 KMOD= if_rtw89 +# Core parts. SRCS= core.c -SRCS+= pci.c pci_be.c SRCS+= chan.c mac80211.c mac.c mac_be.c phy.c phy_be.c fw.c SRCS+= cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c SRCS+= util.c -SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c -SRCS+= rtw8852ae.c -SRCS+= rtw8852c.c rtw8852c_rfk.c rtw8852c_rfk_table.c rtw8852c_table.c -SRCS+= rtw8852ce.c + +# Common SRCS+= rtw8851b.c rtw8851b_rfk.c rtw8851b_rfk_table.c rtw8851b_table.c -SRCS+= rtw8851be.c +SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c SRCS+= rtw8852b_common.c SRCS+= rtw8852b.c rtw8852b_rfk.c rtw8852b_rfk_table.c rtw8852b_table.c -SRCS+= rtw8852be.c SRCS+= rtw8852bt.c rtw8852bt_rfk.c rtw8852bt_rfk_table.c -SRCS+= rtw8852bte.c +SRCS+= rtw8852c.c rtw8852c_rfk.c rtw8852c_rfk_table.c rtw8852c_table.c SRCS+= rtw8922a.c rtw8922a_rfk.c -SRCS+= rtw8922ae.c .if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 SRCS.DEV_ACPI+= acpi.c @@ -38,10 +40,25 @@ CFLAGS+= -DCONFIG_ACPI # This needs to always stay on for the LinuxKPI header file. CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI -# USB parts -#SRCS+= rtw8851bu.c -#SRCS+= rtw8852au.c rtw8852bu.c rtw8852cu.c -#SRCS+= usb.c +# 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_be.c +SRCS+= rtw8851be.c +SRCS+= rtw8852ae.c +SRCS+= rtw8852be.c +SRCS+= rtw8852bte.c +SRCS+= rtw8852ce.c +SRCS+= rtw8922ae.c +.endif + +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +SRCS+= rtw8851bu.c +SRCS+= rtw8852au.c +SRCS+= rtw8852bu.c +SRCS+= rtw8852cu.c +.endif # CONFIG_RTW89_DEBUG (always on for now) SRCS+= debug.c