summaryrefslogtreecommitdiff
path: root/sys/arch/riscv64/conf
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2021-06-12 23:58:25 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2021-06-12 23:58:25 +0000
commitd8f90e549278bdaa4b85e488cafe2acb221ff121 (patch)
tree7e9656703853ce5671a91d1c616fb27b079776c9 /sys/arch/riscv64/conf
parentc59b47de2b4ec742a56164ac2f24a60efd1165a4 (diff)
Serial driver for SiFive Unmatched (U74) based on dev/fdt/amluart.c
console input and output working, userland input and output at least partially working. 'commit that driver, further improvements can happen in-tree' deraadt@
Diffstat (limited to 'sys/arch/riscv64/conf')
-rw-r--r--sys/arch/riscv64/conf/GENERIC3
-rw-r--r--sys/arch/riscv64/conf/RAMDISK3
-rw-r--r--sys/arch/riscv64/conf/files.riscv647
3 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/riscv64/conf/GENERIC b/sys/arch/riscv64/conf/GENERIC
index 55ddd18c757..1991eec700b 100644
--- a/sys/arch/riscv64/conf/GENERIC
+++ b/sys/arch/riscv64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.13 2021/06/12 16:30:16 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.14 2021/06/12 23:58:24 drahn Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -38,6 +38,7 @@ intc0 at cpu0
# NS16550 compatible serial ports
com* at fdt?
+sfuart* at fdt?
virtio* at fdt?
virtio* at pci?
diff --git a/sys/arch/riscv64/conf/RAMDISK b/sys/arch/riscv64/conf/RAMDISK
index 1aef9cace65..691598bfb6d 100644
--- a/sys/arch/riscv64/conf/RAMDISK
+++ b/sys/arch/riscv64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.14 2021/06/12 16:30:16 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.15 2021/06/12 23:58:24 drahn Exp $
machine riscv64
maxusers 4
@@ -34,6 +34,7 @@ intc0 at cpu0
# NS16550 compatible serial ports
com* at fdt?
+sfuart* at fdt?
virtio* at fdt?
virtio* at pci?
diff --git a/sys/arch/riscv64/conf/files.riscv64 b/sys/arch/riscv64/conf/files.riscv64
index 684f48ef817..844076c6c9b 100644
--- a/sys/arch/riscv64/conf/files.riscv64
+++ b/sys/arch/riscv64/conf/files.riscv64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.riscv64,v 1.10 2021/05/19 19:32:25 kettenis Exp $
+# $OpenBSD: files.riscv64,v 1.11 2021/06/12 23:58:24 drahn Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -89,6 +89,11 @@ device sfcc
attach sfcc at fdt
file arch/riscv64/dev/sfcc.c sfcc
+# SiFive uart
+device sfuart
+attach sfuart at fdt
+file arch/riscv64/dev/sfuart.c sfuart
+
# Paravirtual device bus and virtio
include "dev/pv/files.pv"