git: 6e162bd2f298 - main - riscv: Add NVMe, USB and HID support to GENERIC

[Jessica Clarke]

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=6e162bd2f298b58a418a17d49f5671a9a113fc4e

commit 6e162bd2f298b58a418a17d49f5671a9a113fc4e
Author:     Jessica Clarke <jrtc27 at FreeBSD.org>
AuthorDate: 2021-08-07 18:27:33 +0000
Commit:     Jessica Clarke <jrtc27 at FreeBSD.org>
CommitDate: 2021-08-07 18:27:33 +0000

    riscv: Add NVMe, USB and HID support to GENERIC
    
    The SiFive FU740 has both NVMe and USB so we need both to ensure we can
    mount root, and HID is a dependency of USB.
    
    Reviewed by:    kp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D31036
---
 sys/riscv/conf/GENERIC | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 09882853ada2..ae7f1c166273 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -90,6 +90,10 @@ device		riscv_syscon
 # Bus drivers
 device		pci
 
+# Block devices
+device		scbus
+device		da
+
 # VirtIO support
 device		virtio			# Generic VirtIO bus (required)
 device		virtio_pci		# VirtIO PCI device
@@ -97,6 +101,25 @@ device		vtnet			# VirtIO Ethernet device
 device		virtio_blk		# VirtIO Block device
 device		virtio_mmio		# VirtIO MMIO bus
 
+# NVM Express (NVMe) support
+device		nvme		# base NVMe driver
+options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
+device		nvd		# expose NVMe namespaces as disks, depends on nvme
+
+# USB support
+options 	USB_DEBUG		# enable debug msgs
+device		ohci			# OHCI USB interface
+device		uhci			# UHCI USB interface
+device		ehci			# EHCI USB interface (USB 2.0)
+device		xhci			# XHCI USB interface (USB 3.0)
+device		usb			# USB Bus (required)
+device		ukbd			# Keyboard
+device		umass			# Disks/Mass storage - Requires scbus and da
+
+# HID support
+options 	HID_DEBUG	# enable debug msgs
+device		hid		# Generic HID support
+
 # DTrace support
 # device	dtrace
 # device	dtrace_profile