Page MenuHomeFreeBSD
Files F146283177

D55576.id.diff
No OneTemporary
Actions

D55576.id.diff
View Options

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -47,6 +47,7 @@
SOURCELESS_UCODE \
SPLIT_KERNEL_DEBUG \
TESTS \
+ USB \
USB_GADGET_EXAMPLES \
ZFS
@@ -207,6 +208,10 @@
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
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -103,10 +103,14 @@
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
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -357,7 +357,7 @@
${_rtw89} \
rtwn \
rtwn_pci \
- rtwn_usb \
+ ${_rtwn_usb} \
${_rtwnfw} \
${_s3} \
${_safe} \
@@ -412,7 +412,7 @@
${_ufshci} \
uinput \
unionfs \
- usb \
+ ${_usb} \
${_vesa} \
${_vf_i2c} \
virtio \
@@ -711,6 +711,14 @@
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
@@ -939,10 +947,6 @@
_neta= neta
.endif
-.if ${MACHINE_CPUARCH} == "amd64"
-_thunderbolt= thunderbolt
-.endif
-
.if !(${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 110000)
# LLVM 10 crashes when building if_malo_pci.c, fixed in LLVM11:
# https://bugs.llvm.org/show_bug.cgi?id=44351

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 2, 9:39 AM (16 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29086820
Default Alt Text
D55576.id.diff (1 KB)

Event Timeline