From e205fe14c32474cce1d087e1ed2293e98490797f Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 14 Jun 2021 03:50:23 +0000
Subject: [PATCH] Add a few more drivers that people might need. ok drahn

---
 sys/arch/riscv64/conf/GENERIC       | 14 ++++++++------
 sys/arch/riscv64/conf/RAMDISK       | 26 ++++++++++++++++++++------
 sys/arch/riscv64/conf/files.riscv64 |  5 ++++-
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/sys/arch/riscv64/conf/GENERIC b/sys/arch/riscv64/conf/GENERIC
index e184067de03..6dad8f7f0ca 100644
--- a/sys/arch/riscv64/conf/GENERIC
+++ b/sys/arch/riscv64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.16 2021/06/14 03:04:02 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.17 2021/06/14 03:50:23 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -60,7 +60,6 @@ gfrtc*		at fdt?
 
 cad*		at fdt?
 dwge*		at fdt?
-ukphy*		at mii?
 
 dwmmc*		at fdt?
 sdmmc*		at dwmmc?
@@ -76,10 +75,10 @@ pci*		at ppb?
 
 # PCI Ethernet
 em*             at pci?                 # Intel Pro/1000 Ethernet
+bge*		at pci?			# Broadcom BCM57xx (aka Tigon3)
 
-
-# NVME
-nvme*		at pci?
+nvme*		at pci?			# NVMe controllers
+ahci*		at pci?			# AHCI SATA controllers
 
 scsibus*	at scsi?
 sd*		at scsibus?
@@ -87,10 +86,13 @@ cd*		at scsibus?
 ch*		at scsibus?
 uk*		at scsibus?
 
-#USB
+# USB Controllers
 xhci*           at pci?
+
+# USB bus support
 usb*            at xhci?
 
+# USB devices
 uhub*           at usb?
 uhub*           at uhub?
 #uhidev*         at uhub?
diff --git a/sys/arch/riscv64/conf/RAMDISK b/sys/arch/riscv64/conf/RAMDISK
index 8f893c99bef..9636de63941 100644
--- a/sys/arch/riscv64/conf/RAMDISK
+++ b/sys/arch/riscv64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.17 2021/06/14 03:04:02 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.18 2021/06/14 03:50:23 deraadt Exp $
 
 machine		riscv64
 maxusers	4
@@ -56,8 +56,6 @@ gfrtc*		at fdt?
 
 cad*		at fdt?
 dwge*		at fdt?
-ciphy*		at mii?
-ukphy*		at mii?
 
 dwmmc*		at fdt?
 sdmmc*		at dwmmc?
@@ -71,8 +69,12 @@ pci*		at pciecam?
 ppb*		at pci?		# PCI-PCI bridges
 pci*		at ppb?
 
-# NVME
-nvme*		at pci?
+# PCI Ethernet
+em*             at pci?                 # Intel Pro/1000 Ethernet
+bge*		at pci?			# Broadcom BCM57xx (aka Tigon3)
+
+nvme*		at pci?			# NVMe controllers
+ahci*		at pci?			# AHCI SATA controllers
 
 scsibus*	at scsi?
 sd*		at scsibus?
@@ -80,10 +82,13 @@ cd*		at scsibus?
 ch*		at scsibus?
 uk*		at scsibus?
 
-#USB
+# USB Controllers
 xhci*           at pci?
+
+# USB bus support
 usb*            at xhci?
 
+# USB devices
 uhub*           at usb?
 uhub*           at uhub?
 #uhidev*         at uhub?
@@ -119,6 +124,15 @@ otus*           at uhub?                # Atheros AR9001U
 athn*           at uhub?                # Atheros AR9002U
 bwfm*           at uhub?                # Broadcom FullMAC
 
+amphy*          at mii?                 # AMD 79C873 PHYs
+atphy*          at mii?                 # Attansic F1 PHYs
+brgphy*         at mii?                 # Broadcom Gigabit PHYs
+eephy*          at mii?                 # Marvell 88E1000 series PHY
+rgephy*         at mii?                 # Realtek 8169S/8110S PHY
+rlphy*          at mii?                 # Realtek 8139 internal PHYs
+ukphy*          at mii?                 # "unknown" PHYs
+urlphy*         at mii?                 # Realtek RTL8150L internal PHY
+
 pseudo-device	loop 1
 pseudo-device	vlan
 pseudo-device	trunk
diff --git a/sys/arch/riscv64/conf/files.riscv64 b/sys/arch/riscv64/conf/files.riscv64
index 30f8ccd322e..2060f1a8def 100644
--- a/sys/arch/riscv64/conf/files.riscv64
+++ b/sys/arch/riscv64/conf/files.riscv64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.riscv64,v 1.12 2021/06/14 03:04:02 drahn Exp $
+#	$OpenBSD: files.riscv64,v 1.13 2021/06/14 03:50:23 deraadt Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -122,6 +122,9 @@ include "dev/fdt/files.fdt"
 # Machine-independent SCSI drivers
 include "scsi/files.scsi"
 
+# Machine-independent ATA drivers
+include "dev/ata/files.ata"
+
 device	pciecam: pcibus
 attach	pciecam at fdt
 file	dev/fdt/pciecam.c			pciecam
-- 
2.20.1