The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=16e846fa1ed3c97419b55b292f77b0f4209f0875
commit 16e846fa1ed3c97419b55b292f77b0f4209f0875
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2024-04-09 22:02:58 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-04-09 22:02:58 +0000
sys: Enable NVMe drivers on all architectures
The NVMe drivers are portable and are already included statically in
GENERIC on other architectures such as aarch64 and riscv64.
Reviewed by: imp
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D44690
---
share/man/man4/Makefile | 11 ++---------
sys/modules/Makefile | 8 ++------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index c3f5e3223bf9..b668cccf50ae 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -404,9 +404,9 @@ MAN= aac.4 \
${_if_ntb.4} \
null.4 \
numa.4 \
- ${_nvd.4} \
+ nvd.4 \
${_nvdimm.4} \
- ${_nvme.4} \
+ nvme.4 \
${_nvram.4} \
oce.4 \
ocs_fc.4\
@@ -836,8 +836,6 @@ _ntb_hw_amd.4= ntb_hw_amd.4
_ntb_hw_intel.4= ntb_hw_intel.4
_ntb_hw_plx.4= ntb_hw_plx.4
_ntb_transport.4=ntb_transport.4
-_nvd.4= nvd.4
-_nvme.4= nvme.4
_nvram.4= nvram.4
_padlock.4= padlock.4
_pchtherm.4= pchtherm.4
@@ -885,11 +883,6 @@ _vmm.4= vmm.4
.endif
.endif
-.if ${MACHINE_CPUARCH} == "powerpc"
-_nvd.4= nvd.4
-_nvme.4= nvme.4
-.endif
-
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
${MACHINE_CPUARCH} == "aarch64"
_gve.4= gve.4
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 748b0b18a14d..aab0865a842d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -290,9 +290,9 @@ SUBDIR= \
nmdm \
nullfs \
${_ntb} \
- ${_nvd} \
+ nvd \
${_nvdimm} \
- ${_nvme} \
+ nvme \
${_nvram} \
oce \
${_ocs_fc} \
@@ -795,8 +795,6 @@ _iwmfw= iwmfw
_iwnfw= iwnfw
.endif
_nfe= nfe
-_nvd= nvd
-_nvme= nvme
_nvram= nvram
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
@@ -880,8 +878,6 @@ _cfi= cfi
_cpufreq= cpufreq
_exca= exca
_ffec= ffec
-_nvd= nvd
-_nvme= nvme
.endif
.if ${MACHINE_ARCH:Mpowerpc64*} != ""
