aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-11-28 19:11:56 +0000
committerEd Maste <emaste@FreeBSD.org>2021-11-28 19:38:41 +0000
commit28dcccc1296398f10fcd69883b553161a7a83593 (patch)
tree922dc5bb466ed2577a6b92814a6e983c9a73e15b
parent777526ed83822e1af2b7f7ea4186dbf7d3d3d60a (diff)
x86 GENERIC/MINIMAL: group sc(4) devices together
The vga and splash devices are part of the sc(4) system console. vt(4) uses the vt_vga driver instead, and has some limited splash support directly in vt_core.c. Leave the sc(4) options in GENERIC/MINIMAL (for now) but group them together under an sc(4) comment. Sponsored by: The FreeBSD Foundation
-rw-r--r--sys/amd64/conf/GENERIC4
-rw-r--r--sys/amd64/conf/MINIMAL4
-rw-r--r--sys/i386/conf/GENERIC4
-rw-r--r--sys/i386/conf/MINIMAL4
4 files changed, 4 insertions, 12 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index edd7ae6419d2..4d679e89c92d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -212,11 +212,9 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
+# syscons is the legacy console driver, resembling an SCO console
device vga # VGA video card driver
-
device splash # Splash screen and screen saver support
-
-# syscons is the legacy console driver, resembling an SCO console
device sc
options SC_PIXEL_MODE # add support for the raster text mode
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index 5f99f85b996d..3c9dc8f4df5b 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -104,11 +104,9 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
+# syscons is the legacy console driver, resembling an SCO console
device vga # VGA video card driver
-
device splash # Splash screen and screen saver support
-
-# syscons is the legacy console driver, resembling an SCO console
device sc
options SC_PIXEL_MODE # add support for the raster text mode
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 26bdf4a53ed0..679fc8b706f8 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -181,11 +181,9 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
+# syscons is the legacy console driver, resembling an SCO console
device vga # VGA video card driver
-
device splash # Splash screen and screen saver support
-
-# syscons is the legacy console driver, resembling an SCO console
device sc
options SC_PIXEL_MODE # add support for the raster text mode
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 1716f8018c36..d9d556048b76 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -115,11 +115,9 @@ device psm # PS/2 mouse
device kbdmux # keyboard multiplexer
+# syscons is the legacy console driver, resembling an SCO console
device vga # VGA video card driver
-
device splash # Splash screen and screen saver support
-
-# syscons is the legacy console driver, resembling an SCO console
device sc
options SC_PIXEL_MODE # add support for the raster text mode