The branch main has been updated by bz:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f19cb3c72b001f5ca2204888bfab50e2f388547d

commit f19cb3c72b001f5ca2204888bfab50e2f388547d
Author:     Bjoern A. Zeeb <[email protected]>
AuthorDate: 2026-01-31 23:16:55 +0000
Commit:     Bjoern A. Zeeb <[email protected]>
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

Reply via email to