summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorray <ray@FreeBSD.org>2014-07-07 14:16:05 +0000
committerray <ray@FreeBSD.org>2014-07-07 14:16:05 +0000
commit74b8e10dc8320877d77c972a0f9a432c58388311 (patch)
tree7d808123341a80f55c4f3e9f60035f4df44fc403 /sys/i386
parent51242982dad67c86d8775c0abc241de6f2dc768d (diff)
downloadFreeBSD-src-74b8e10dc8320877d77c972a0f9a432c58388311.zip
FreeBSD-src-74b8e10dc8320877d77c972a0f9a432c58388311.tar.gz
267622 Log:
Rename vt(4) vga module to dismiss interference with syscons(4) vga module. 267623 Log: Remove stale link to deleted vt(4) xboxfb driver. 267624 Log: syscons(4) and vt(4) can be built together now. 267625 Log: Allow to disable syscons(4) if "hw.syscons.disable" kenv is set. 267626 Log: Suspend vt(4) initialization if "kern.vt.disable" kenv is set. 267965 by emaste@ Log: Use a common tunable to choose between vt(4)/sc(4) With this change and previous work from ray@ it will be possible to put both in GENERIC, and have one enabled by default, but allow the other to be selected via the loader. (The previous implementation had separate kern.vt.disable and hw.syscons.disable tunables, and would panic if both drivers were compiled in and neither was explicitly disabled.) 268175 by emaste@ Log: Fix vt(4) detection in kbdcontrol and vidcontrol As sc(4) and vt(4) coexist and are both enabled in GENERIC, the existence of a vt(4) sysctl is not sufficient to determine that vt(4) is in use. Reported by: Trond Endrestøl 268045 by emaste@ Log: Add vt(4) to GENERIC and retire the separate VT config vt(4) and sc(4) can now coexist in the same kernel. To choose the vt driver, set the loader tunable kern.vty=vt . Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/GENERIC4
-rw-r--r--sys/i386/conf/VT14
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index db904ef..642336e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -181,6 +181,10 @@ device splash # Splash screen and screen saver support
device sc
options SC_PIXEL_MODE # add support for the raster text mode
+# vt is the new video console driver
+device vt
+device vt_vga
+
device agp # support several AGP chipsets
# Power management support (see NOTES for more options)
diff --git a/sys/i386/conf/VT b/sys/i386/conf/VT
deleted file mode 100644
index 7d0547f..0000000
--- a/sys/i386/conf/VT
+++ /dev/null
@@ -1,14 +0,0 @@
-# VT -- kernel config using the vt(9) system console instead of legacy syscons
-#
-# For more information see https://wiki.freebsd.org/Newcons
-#
-# $FreeBSD$
-
-include GENERIC
-ident VT
-
-nodevice sc
-nodevice vga
-
-device vt
-device vt_vga
OpenPOWER on IntegriCloud