From nobody Fri Feb 27 02:30:05 2026 X-Original-To: dev-commits-src-all@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 4fMXNY5yklz6T7rb for ; Fri, 27 Feb 2026 02:30:05 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXNY2HJdz41YN for ; Fri, 27 Feb 2026 02:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159405; 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=yQriIJp7TMnyGmx+Ed3zscnu6dAbCkgKCE/M9gVS+T4=; b=i6dcongXox900hi1Mo9S/xW5bIOh2deGoWPDmhGWTsMw84+w2JSePG9M99/KbEH7wuzgoo xVi55qSxqniLFTJBg27B6g61bau9B9PDy7r4DEVqf0nrV1T1GbW40cgK1EhPXvw94OeweH RJfJPQcxQGsYPDUXt7dfZwCztzZ0kkKbHUFQI3uLhpwOeKxgCM0Q/eFP9rfalfJuhX9Si5 LnXrgbgvFGsy9akBnTUSKET7XEf8lWx3kU5H+gsGWuwnZS+3QcGhf8CFfupq8cdEilspga K6cWLtGlsYR0gh8Ve0gAlZ6maVzYBgR5hAVMzrv3YL0Bg4cvBMhe0wtLwUXzlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159405; a=rsa-sha256; cv=none; b=X9T78Y+BUcV3WbtGgNkjqdW7yhF/tuhWG23SH8bjekFN7fD6aGK8GJml8ex8kYVG34swcS SCDM1RYWBoXkWGNkoN+3lftJ6fcRxvVez2eHoU98TUdzugab53YUdh95gLk/hqVOC8WoBg Qzfa/x7I+Sxvr3tkesstqn9LGNgdHpsXRKXClKP2ItCabWwWcMXx/JKMtwnpiURS3Jp3Vb QxQlEOxwbppnaLYzFHGQpe7UpzABOK0Vr+8kikQeN+OLjNcpwjn1qb08VlZrVunswfIMMg Eu91SSEHuufqw8O1U1Uf+9Toa4uUdjvwgM3WGPQ5gQOc6b7l9L7W9FACCe68GA== 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=1772159405; 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=yQriIJp7TMnyGmx+Ed3zscnu6dAbCkgKCE/M9gVS+T4=; b=da1JRN+qFasxWcBhlbzwS7cVfKCyR1SQeaj7tQmRAh+j+sFcZc+dhJBvzQ1I+R31br7NzK 1GsoldtZIIbUdF9pznk4arI1gBaJiCKxWvzB1ZW1O4xU9rH/T/hOsHlvKkBkbh8rtVDVop 0knSlwSihsT/3op2y27AdHeMWhFPyOyTj4dj5eLgzN6sP4b8kxMmalDiZZr4wdZdVPGLU0 jiXABWuPMpUjqFt4VYJrEljQ7hvugKdF/reP5+X8XslzurlBuxA0yC0/mrGZWlfx+aoGR+ Ey22LuSd7jpzEfBp80ixGN7ybIfnCvmYBsgintky4OkMcgu2rPQaVwXp+YD6XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNY0tw9zyZk for ; Fri, 27 Feb 2026 02:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20fdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:30:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d4270bedae78 - stable/15 - rtw89: module Makefile add USB bus attachments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: d4270bedae78866eab8024cfe71770206a2d7840 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:30:05 +0000 Message-Id: <69a101ad.20fdf.72205a75@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d4270bedae78866eab8024cfe71770206a2d7840 commit d4270bedae78866eab8024cfe71770206a2d7840 Author: Bjoern A. Zeeb AuthorDate: 2026-01-31 23:16:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:06:46 +0000 rtw89: module Makefile add USB bus attachments Sponsored by: The FreeBSD Foundation (cherry picked from commit f19cb3c72b001f5ca2204888bfab50e2f388547d) --- 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