diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2020-06-22 00:33:29 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2020-06-22 00:33:29 +0000 |
| commit | e9b1254101a2001a2f581c8c5315f8684a3a0c6b (patch) | |
| tree | 0229908630da741239f3d1b4135ba457a6a1e630 /sys/arch | |
| parent | 83fb3c2c662b955d316517410a4b42b272b4200e (diff) | |
enable nvme on i386.
ok deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index ad83d7d34a6..0c0d8d1eb95 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.850 2020/01/22 05:06:19 tedu Exp $ +# $OpenBSD: GENERIC,v 1.851 2020/06/22 00:33:28 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -468,6 +468,7 @@ uha* at eisa? # UltraStor 24f SCSI controllers wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers #wds1 at isa? port 0x358 irq 11 drq 5 vmwpvs* at pci? # VMware ParaVirtual SCSI +nvme* at pci? # NVMe controllers scsibus* at scsi? sd* at scsibus? # SCSI disk drives diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 74685af95c4..618f71f571a 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.242 2020/03/20 16:12:07 otto Exp $ +# $OpenBSD: RAMDISK_CD,v 1.243 2020/06/22 00:33:28 dlg Exp $ machine i386 maxusers 4 @@ -162,6 +162,8 @@ pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers uha* at eisa? # UltraStor 24f SCSI controllers vmwpvs* at pci? # VMware ParaVirtual SCSI +nvme* at pci? # NVMe controllers + softraid0 at root scsibus* at scsi? |