diff options
| author | jimharris <jimharris@FreeBSD.org> | 2012-09-17 21:41:38 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2012-09-17 21:41:38 +0000 |
| commit | 35d5f1b45783602bdc69a4c86fd94601568f4307 (patch) | |
| tree | 32bc1df960eec5444a622c7ace136bf3c18c53fe | |
| parent | 780e34335877dc180bc72eaffaab22d097e556a5 (diff) | |
| download | FreeBSD-src-35d5f1b45783602bdc69a4c86fd94601568f4307.zip FreeBSD-src-35d5f1b45783602bdc69a4c86fd94601568f4307.tar.gz | |
Integrate nvmecontrol(8) into the amd64 and i386 builds.
This includes adding NVMe header files to /usr/include/dev/nvme.
Sponsored by: Intel
| -rw-r--r-- | etc/mtree/BSD.include.dist | 2 | ||||
| -rw-r--r-- | include/Makefile | 4 | ||||
| -rw-r--r-- | sbin/Makefile.amd64 | 1 | ||||
| -rw-r--r-- | sbin/Makefile.i386 | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 7e6251f..3d918a7 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -126,6 +126,8 @@ .. nand .. + nvme + .. ofw .. pbio diff --git a/include/Makefile b/include/Makefile index 3555831..573a661 100644 --- a/include/Makefile +++ b/include/Makefile @@ -40,8 +40,8 @@ LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ 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 \ diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64 index 2d231b0..d3cf350 100644 --- a/sbin/Makefile.amd64 +++ b/sbin/Makefile.amd64 @@ -2,3 +2,4 @@ SUBDIR += bsdlabel SUBDIR += fdisk +SUBDIR += nvmecontrol diff --git a/sbin/Makefile.i386 b/sbin/Makefile.i386 index 4135c44..0ced312 100644 --- a/sbin/Makefile.i386 +++ b/sbin/Makefile.i386 @@ -2,4 +2,5 @@ SUBDIR += bsdlabel SUBDIR += fdisk +SUBDIR += nvmecontrol SUBDIR += sconfig |
