Author: jimharris
Date: Mon Sep 17 19:26:33 2012
New Revision: 240618
URL: http://svn.freebsd.org/changeset/base/240618
Log:
Integrate nvme(4) and nvd(4) into the amd64 and i386 builds.
Sponsored by: Intel
Modified:
head/sys/amd64/conf/NOTES
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/i386/conf/NOTES
head/sys/modules/Makefile
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES Mon Sep 17 19:25:24 2012 (r240617)
+++ head/sys/amd64/conf/NOTES Mon Sep 17 19:26:33 2012 (r240618)
@@ -428,6 +428,11 @@ 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
+
+#
# SafeNet crypto driver: can be moved to the MI NOTES as soon as
# it's tested on a big-endian machine
#
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Mon Sep 17 19:25:24 2012 (r240617)
+++ head/sys/conf/files.amd64 Mon Sep 17 19:26:33 2012 (r240618)
@@ -212,7 +212,17 @@ dev/kbd/kbd.c optional atkbd |
sc | uk
dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
+dev/nvd/nvd.c optional nvd nvme
dev/nve/if_nve.c optional nve pci
+dev/nvme/nvme.c optional nvme
+dev/nvme/nvme_ctrlr.c optional nvme
+dev/nvme/nvme_ctrlr_cmd.c optional nvme
+dev/nvme/nvme_ns.c optional nvme
+dev/nvme/nvme_ns_cmd.c optional nvme
+dev/nvme/nvme_qpair.c optional nvme
+dev/nvme/nvme_sysctl.c optional nvme
+dev/nvme/nvme_test.c optional nvme
+dev/nvme/nvme_uio.c optional nvme
dev/nvram/nvram.c optional nvram isa
dev/random/ivy.c optional random rdrand_rng
dev/random/nehemiah.c optional random padlock_rng
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Mon Sep 17 19:25:24 2012 (r240617)
+++ head/sys/conf/files.i386 Mon Sep 17 19:26:33 2012 (r240618)
@@ -224,7 +224,17 @@ dev/lindev/lindev.c optional lindev
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
+dev/nvd/nvd.c optional nvd nvme
dev/nve/if_nve.c optional nve pci
+dev/nvme/nvme.c optional nvme
+dev/nvme/nvme_ctrlr.c optional nvme
+dev/nvme/nvme_ctrlr_cmd.c optional nvme
+dev/nvme/nvme_ns.c optional nvme
+dev/nvme/nvme_ns_cmd.c optional nvme
+dev/nvme/nvme_qpair.c optional nvme
+dev/nvme/nvme_sysctl.c optional nvme
+dev/nvme/nvme_test.c optional nvme
+dev/nvme/nvme_uio.c optional nvme
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
dev/random/ivy.c optional random rdrand_rng
Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES Mon Sep 17 19:25:24 2012 (r240617)
+++ head/sys/i386/conf/NOTES Mon Sep 17 19:26:33 2012 (r240618)
@@ -747,6 +747,11 @@ 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
+
+#
# SafeNet crypto driver: can be moved to the MI NOTES as soon as
# it's tested on a big-endian machine
#
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Mon Sep 17 19:25:24 2012 (r240617)
+++ head/sys/modules/Makefile Mon Sep 17 19:26:33 2012 (r240618)
@@ -244,7 +244,9 @@ SUBDIR= \
ntfs \
ntfs_iconv \
nullfs \
+ ${_nvd} \
${_nve} \
+ ${_nvme} \
${_nvram} \
${_nwfs} \
${_nxge} \
@@ -586,9 +588,11 @@ _ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
+_nvd= nvd
.if ${MK_SOURCELESS_HOST} != "no"
_nve= nve
.endif
+_nvme= nvme
_nvram= nvram
_nxge= nxge
_tpm= tpm
@@ -695,9 +699,11 @@ _mthca= mthca
.endif
_ndis= ndis
_nfe= nfe
+_nvd= nvd
.if ${MK_SOURCELESS_HOST} != "no"
_nve= nve
.endif
+_nvme= nvme
_nvram= nvram
_nxge= nxge
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
