Author: jimharris
Date: Mon Sep 17 21:41:38 2012
New Revision: 240621
URL: http://svn.freebsd.org/changeset/base/240621

Log:
  Integrate nvmecontrol(8) into the amd64 and i386 builds.
  
  This includes adding NVMe header files to /usr/include/dev/nvme.
  
  Sponsored by:  Intel

Modified:
  head/etc/mtree/BSD.include.dist
  head/include/Makefile
  head/sbin/Makefile.amd64
  head/sbin/Makefile.i386

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist     Mon Sep 17 21:26:55 2012        
(r240620)
+++ head/etc/mtree/BSD.include.dist     Mon Sep 17 21:41:38 2012        
(r240621)
@@ -126,6 +126,8 @@
         ..
         nand
         ..
+        nvme
+        ..
         ofw
         ..
         pbio

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile       Mon Sep 17 21:26:55 2012        (r240620)
+++ head/include/Makefile       Mon Sep 17 21:41:38 2012        (r240621)
@@ -40,8 +40,8 @@ LDIRS=        bsm cam geom net net80211 netatal
 
 LSUBDIRS=      cam/ata cam/scsi \
        dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \
-       dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
-       dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+       dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \
+       dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
        dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
        fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \
        ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \

Modified: head/sbin/Makefile.amd64
==============================================================================
--- head/sbin/Makefile.amd64    Mon Sep 17 21:26:55 2012        (r240620)
+++ head/sbin/Makefile.amd64    Mon Sep 17 21:41:38 2012        (r240621)
@@ -2,3 +2,4 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol

Modified: head/sbin/Makefile.i386
==============================================================================
--- head/sbin/Makefile.i386     Mon Sep 17 21:26:55 2012        (r240620)
+++ head/sbin/Makefile.i386     Mon Sep 17 21:41:38 2012        (r240621)
@@ -2,4 +2,5 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
 SUBDIR += sconfig
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to