summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2007-01-10 18:45:18 +0000
committermarius <marius@FreeBSD.org>2007-01-10 18:45:18 +0000
commit51a8caf7cd2cb41365cfcb8d7b6bf736f8f8fed6 (patch)
tree3f6726d1925c9842355c82fbdb12157531121909
parent523fae4cf87a3620f35380ca003c56176ec7e176 (diff)
downloadFreeBSD-src-51a8caf7cd2cb41365cfcb8d7b6bf736f8f8fed6.zip
FreeBSD-src-51a8caf7cd2cb41365cfcb8d7b6bf736f8f8fed6.tar.gz
Add missing SC_NO_MODE_CHANGE option. Disable it in the powerpc
NOTES though, as ofw_syscons(4) doesn't properly interface with syscons(4) regarding loading the font specified with SC_DFLT_FONT, causing a kernel with both options SC_OFWFB and SC_NO_MODE_CHANGE to not link.
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/options1
-rw-r--r--sys/powerpc/conf/NOTES1
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 6a60e3c..c075f7c 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1398,6 +1398,7 @@ options SC_TWOBUTTON_MOUSE
options SC_NO_CUTPASTE
options SC_NO_FONT_LOADING
options SC_NO_HISTORY
+options SC_NO_MODE_CHANGE
options SC_NO_SYSMOUSE
options SC_NO_SUSPEND_VTYSWITCH
diff --git a/sys/conf/options b/sys/conf/options
index 388421e..d7a2c03 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -707,6 +707,7 @@ SC_MOUSE_CHAR opt_syscons.h
SC_NO_CUTPASTE opt_syscons.h
SC_NO_FONT_LOADING opt_syscons.h
SC_NO_HISTORY opt_syscons.h
+SC_NO_MODE_CHANGE opt_syscons.h
SC_NO_SUSPEND_VTYSWITCH opt_syscons.h
SC_NO_SYSMOUSE opt_syscons.h
SC_NORM_ATTR opt_syscons.h
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 633e339..650f0b1 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -60,4 +60,5 @@ nooption SMP
nooption GDB
nooption PPC_DEBUG
nooption PPC_PROBE_CHIPSET
+nooption SC_NO_MODE_CHANGE
nooption UKBD_DFLT_KEYMAP
OpenPOWER on IntegriCloud