Page MenuHomeFreeBSD
Files F107449983

D44691.diff
No OneTemporary
Actions

D44691.diff
View Options

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -439,11 +439,6 @@
device isci
options ISCI_LOGGING # enable debugging in isci HAL
-#
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-device nvd # expose NVMe namespaces as disks, depends on nvme
-
#
# Intel Volume Management Device (VMD) support
device vmd
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -102,11 +102,6 @@
# Etherswitch devices
device e6000sw # Marvell mv88e6085 based switches
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
-device nvd # expose NVMe namespaces as disks, depends on nvme
-
# MMC/SD/SDIO Card slot support
device sdhci_xenon # Marvell Xenon SD/MMC controller
device aw_mmc # Allwinner SD/MMC controller
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1675,6 +1675,17 @@
options MFI_DEBUG
device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
+# NVM Express
+#
+# nvme: PCI-express NVM Express host controllers
+# nda: CAM NVMe disk driver
+# nvd: non-CAM NVMe disk driver
+
+device nvme # base NVMe driver
+options NVME_USE_NVD=1 # Use nvd(4) instead of the CAM nda(4) driver
+device nda # NVMe direct access devices (aka disks)
+device nvd # expose NVMe namespaces as disks, depends on nvme
+
#
# Serial ATA host controllers:
#
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -634,11 +634,6 @@
device isci
options ISCI_LOGGING # enable debugging in isci HAL
-#
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-device nvd # expose NVMe namespaces as disks, depends on nvme
-
#
# Intel Volume Management Device (VMD) support
device vmd
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -40,11 +40,6 @@
device virtio_mmio # VirtIO MMIO bus
device virtio_random # VirtIO Entropy device
-# NVM Express (NVMe) support
-device nvme # base NVMe driver
-options NVME_USE_NVD=0 # prefer the cam(4) based nda(4) driver
-device nvd # expose NVMe namespaces as disks, depends on nvme
-
# MMC/SD/SDIO Card slot support
device dwmmc

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 15, 8:08 AM (13 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15808079
Default Alt Text
D44691.diff (2 KB)

Event Timeline