From 60809db9feccfed57e225220657603705b14b1ce Mon Sep 17 00:00:00 2001
From: Visa Hankala <visa@cvs.openbsd.org>
Date: Sat, 7 Sep 2019 14:03:53 +0000
Subject: Enable nvme(4) on octeon.

---
 sys/arch/octeon/conf/BOOT    | 5 ++++-
 sys/arch/octeon/conf/GENERIC | 5 ++++-
 sys/arch/octeon/conf/RAMDISK | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/octeon/conf/BOOT b/sys/arch/octeon/conf/BOOT
index 03745771501..da4f7920664 100644
--- a/sys/arch/octeon/conf/BOOT
+++ b/sys/arch/octeon/conf/BOOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: BOOT,v 1.6 2019/09/07 13:58:58 visa Exp $
+#	$OpenBSD: BOOT,v 1.7 2019/09/07 14:03:52 visa Exp $
 
 machine		octeon mips64
 maxusers	4
@@ -48,6 +48,9 @@ pci*		at ppb?
 octsctl*	at fdt?
 ahci*		at octsctl?
 
+# NVMe controllers
+nvme*		at pci?
+
 dwctwo0		at iobus0 irq 56
 octuctl*	at fdt?
 octxctl*	at fdt?
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC
index 1100936dada..4803c966345 100644
--- a/sys/arch/octeon/conf/GENERIC
+++ b/sys/arch/octeon/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.48 2019/09/07 13:58:58 visa Exp $
+#	$OpenBSD: GENERIC,v 1.49 2019/09/07 14:03:52 visa Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -78,6 +78,9 @@ wd*		at pciide? flags 0x0000
 octsctl*	at fdt?
 ahci*		at octsctl?
 
+# NVMe controllers
+nvme*		at pci?
+
 # USB Controllers
 dwctwo0 	at iobus? irq 56
 octuctl*	at fdt?
diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK
index 56b3955c25d..ded22945e87 100644
--- a/sys/arch/octeon/conf/RAMDISK
+++ b/sys/arch/octeon/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.41 2019/09/07 13:58:58 visa Exp $
+#	$OpenBSD: RAMDISK,v 1.42 2019/09/07 14:03:52 visa Exp $
 
 machine		octeon mips64
 maxusers	4
@@ -67,6 +67,9 @@ wd*		at pciide? flags 0x0000
 octsctl*	at fdt?
 ahci*		at octsctl?
 
+# NVMe controllers
+nvme*		at pci?
+
 dwctwo0		at iobus0 irq 56
 octuctl*	at fdt?
 octxctl*	at fdt?
-- 
cgit v1.2.3