Skip to content

Commit

Permalink
sys: Enable NVMe drivers on all architectures
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bsdjhb committed Apr 9, 2024
1 parent a508f5d commit 16e846f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
11 changes: 2 additions & 9 deletions share/man/man4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions sys/modules/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ SUBDIR= \
nmdm \
nullfs \
${_ntb} \
${_nvd} \
nvd \
${_nvdimm} \
${_nvme} \
nvme \
${_nvram} \
oce \
${_ocs_fc} \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -880,8 +878,6 @@ _cfi= cfi
_cpufreq= cpufreq
_exca= exca
_ffec= ffec
_nvd= nvd
_nvme= nvme
.endif

.if ${MACHINE_ARCH:Mpowerpc64*} != ""
Expand Down

0 comments on commit 16e846f

Please sign in to comment.