enable nvme, a few pci devices and a bunch of usb stuff.

will cleanup later, enabling additional systems.

diff --git a/sys/arch/riscv64/conf/GENERIC b/sys/arch/riscv64/conf/GENERIC
index 9817d5e..e184067 100644 (file)
--- a/sys/arch/riscv64/conf/GENERIC
+++ b/sys/arch/riscv64/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.15 2021/06/13 00:46:27 drahn Exp $
+#      $OpenBSD: GENERIC,v 1.16 2021/06/14 03:04:02 drahn Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -74,11 +74,66 @@ pci*                at pciecam?
 ppb*           at pci?         # PCI-PCI bridges
 pci*           at ppb?
 
+# PCI Ethernet
+em*             at pci?                 # Intel Pro/1000 Ethernet
+
+
+# NVME
+nvme*          at pci?
+
 scsibus*       at scsi?
 sd*            at scsibus?
 cd*            at scsibus?
 ch*            at scsibus?
 uk*            at scsibus?
 
+#USB
+xhci*           at pci?
+usb*            at xhci?
+
+uhub*           at usb?
+uhub*           at uhub?
+#uhidev*         at uhub?
+#ukbd*           at uhidev?
+#wskbd*          at ukbd? mux 1
+umass*          at uhub?
+aue*            at uhub?                # ADMtek AN986 Pegasus Ethernet
+atu*            at uhub?                # Atmel AT76c50x based 802.11b
+axe*            at uhub?                # ASIX Electronics AX88172 USB Ethernet
+axen*           at uhub?                # ASIX Electronics AX88179 USB Ethernet
+cue*            at uhub?                # CATC USB-EL1201A based Ethernet
+kue*            at uhub?                # Kawasaki KL5KUSB101B based Ethernet
+smsc*           at uhub?                # SMSC LAN95xx Ethernet
+cdce*           at uhub?                # CDC Ethernet
+udav*           at uhub?                # Davicom DM9601 based Ethernet
+mos*            at uhub?                # MOSCHIP MCS7730/7830 10/100 Ethernet
+mue*            at uhub?                # Microchip LAN75xx/LAN78xx Ethernet
+url*            at uhub?                # Realtek RTL8150L based adapters
+ure*            at uhub?                # Realtek RTL8152 based adapters
+wi*             at uhub?                # WaveLAN IEEE 802.11DS
+upl*            at uhub?                # Prolific PL2301/PL2302 host-to-host
+ugl*            at uhub?                # Genesys Logic GL620USB-A host-to-host
+ural*           at uhub?                # Ralink RT2500
+rum*            at uhub?                # Ralink RT2501USB/RT2601USB
+run*            at uhub?                # Ralink RT2700U/RT2800U/RT3000U
+zyd*            at uhub?                # Zydas ZD1211
+upgt*           at uhub?                # Conexant/Intersil PrismGT SoftMAC USB
+urtw*           at uhub?                # Realtek 8187
+urtwn*          at uhub?                # Realtek RTL8188CU/RTL8192CU
+rsu*            at uhub?                # Realtek RTL8188SU/RTL8191SU/RTL8192SU
+uath*           at uhub?                # Atheros AR5005UG/AR5005UX
+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-Devices
 pseudo-device  openprom

diff --git a/sys/arch/riscv64/conf/RAMDISK b/sys/arch/riscv64/conf/RAMDISK
index a80d778..8f893c9 100644 (file)
--- a/sys/arch/riscv64/conf/RAMDISK
+++ b/sys/arch/riscv64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.16 2021/06/13 00:46:27 drahn Exp $
+#      $OpenBSD: RAMDISK,v 1.17 2021/06/14 03:04:02 drahn Exp $
 
 machine                riscv64
 maxusers       4
@@ -56,6 +56,7 @@ gfrtc*                at fdt?
 
 cad*           at fdt?
 dwge*          at fdt?
+ciphy*         at mii?
 ukphy*         at mii?
 
 dwmmc*         at fdt?
@@ -70,12 +71,54 @@ pci*                at pciecam?
 ppb*           at pci?         # PCI-PCI bridges
 pci*           at ppb?
 
+# NVME
+nvme*          at pci?
+
 scsibus*       at scsi?
 sd*            at scsibus?
 cd*            at scsibus?
 ch*            at scsibus?
 uk*            at scsibus?
 
+#USB
+xhci*           at pci?
+usb*            at xhci?
+
+uhub*           at usb?
+uhub*           at uhub?
+#uhidev*         at uhub?
+#ukbd*           at uhidev?
+#wskbd*          at ukbd? mux 1
+umass*          at uhub?
+aue*            at uhub?                # ADMtek AN986 Pegasus Ethernet
+atu*            at uhub?                # Atmel AT76c50x based 802.11b
+axe*            at uhub?                # ASIX Electronics AX88172 USB Ethernet
+axen*           at uhub?                # ASIX Electronics AX88179 USB Ethernet
+cue*            at uhub?                # CATC USB-EL1201A based Ethernet
+kue*            at uhub?                # Kawasaki KL5KUSB101B based Ethernet
+smsc*           at uhub?                # SMSC LAN95xx Ethernet
+cdce*           at uhub?                # CDC Ethernet
+udav*           at uhub?                # Davicom DM9601 based Ethernet
+mos*            at uhub?                # MOSCHIP MCS7730/7830 10/100 Ethernet
+mue*            at uhub?                # Microchip LAN75xx/LAN78xx Ethernet
+url*            at uhub?                # Realtek RTL8150L based adapters
+ure*            at uhub?                # Realtek RTL8152 based adapters
+wi*             at uhub?                # WaveLAN IEEE 802.11DS
+upl*            at uhub?                # Prolific PL2301/PL2302 host-to-host
+ugl*            at uhub?                # Genesys Logic GL620USB-A host-to-host
+ural*           at uhub?                # Ralink RT2500
+rum*            at uhub?                # Ralink RT2501USB/RT2601USB
+run*            at uhub?                # Ralink RT2700U/RT2800U/RT3000U
+zyd*            at uhub?                # Zydas ZD1211
+upgt*           at uhub?                # Conexant/Intersil PrismGT SoftMAC USB
+urtw*           at uhub?                # Realtek 8187
+urtwn*          at uhub?                # Realtek RTL8188CU/RTL8192CU
+rsu*            at uhub?                # Realtek RTL8188SU/RTL8191SU/RTL8192SU
+uath*           at uhub?                # Atheros AR5005UG/AR5005UX
+otus*           at uhub?                # Atheros AR9001U
+athn*           at uhub?                # Atheros AR9002U
+bwfm*           at uhub?                # Broadcom FullMAC
+
 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 844076c..30f8ccd 100644 (file)
--- a/sys/arch/riscv64/conf/files.riscv64
+++ b/sys/arch/riscv64/conf/files.riscv64
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.riscv64,v 1.11 2021/06/12 23:58:24 drahn Exp $
+#      $OpenBSD: files.riscv64,v 1.12 2021/06/14 03:04:02 drahn Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -125,3 +125,7 @@ include "scsi/files.scsi"
 device pciecam: pcibus
 attach pciecam at fdt
 file   dev/fdt/pciecam.c                       pciecam
+
+# Machine-independent USB drivers
+include "dev/usb/files.usb"
+