summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Cambus <fcambus@cvs.openbsd.org>2020-06-23 13:57:06 +0000
committerFrederic Cambus <fcambus@cvs.openbsd.org>2020-06-23 13:57:06 +0000
commit368bfe2881019b37ebe5c54f9a50f0e35fa003fe (patch)
tree2cdd2b5907619fd6cf1d194046b48b71e93d9c5b
parent167d2f9e9a0db5590d47d357e429227345295806 (diff)
Enable virtual consoles on armv7, the same way it is done on arm64.
Tested on a Cubieboard2. OK patrick@
-rw-r--r--etc/etc.armv7/ttys14
-rw-r--r--sys/arch/armv7/conf/GENERIC6
2 files changed, 16 insertions, 4 deletions
diff --git a/etc/etc.armv7/ttys b/etc/etc.armv7/ttys
index a823655d7de..64a55c241c7 100644
--- a/etc/etc.armv7/ttys
+++ b/etc/etc.armv7/ttys
@@ -1,9 +1,21 @@
#
-# $OpenBSD: ttys,v 1.1 2013/09/04 16:53:40 patrick Exp $
+# $OpenBSD: ttys,v 1.2 2020/06/23 13:57:05 fcambus Exp $
#
# name getty type status comments
#
console "/usr/libexec/getty std.115200" vt220 on secure
+ttyC0 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC1 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC2 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC3 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC4 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC5 "/usr/libexec/getty std.9600" vt220 on secure
+ttyC6 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC7 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC8 "/usr/libexec/getty std.9600" vt220 off secure
+ttyC9 "/usr/libexec/getty std.9600" vt220 off secure
+ttyCa "/usr/libexec/getty std.9600" vt220 off secure
+ttyCb "/usr/libexec/getty std.9600" vt220 off secure
tty00 "/usr/libexec/getty std.115200" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off secure
tty02 "/usr/libexec/getty std.9600" unknown off
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index 7a1708f0f00..d440ffd902b 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.131 2020/04/29 19:30:58 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.132 2020/06/23 13:57:05 fcambus Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -17,9 +17,9 @@ makeoptions KERNEL_BASE_VIRT="0xc0300000"
maxusers 32 # estimated number of users
option CPU_ARMv7 # Support the ARMv7
-#option WSDISPLAY_COMPAT_USL # VT handling
+option WSDISPLAY_COMPAT_USL # VT handling
option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-option WSDISPLAY_DEFAULTSCREENS=1
+option WSDISPLAY_DEFAULTSCREENS=6 # initial number of text consoles
option CONF_HAVE_GPIO
option PCIVERBOSE