Module Name: src
Committed By: macallan
Date: Tue Jun 26 02:04:56 UTC 2012
Modified Files:
src/sys/arch/sparc/conf: GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX
Log Message:
switch to WSEMUL_VT100 to reduce differences with sparc64 and other wscons
and fb console using ports
WSEMUL_SUN is left in but commented out so whoever wants it back can have it
with minimal effort
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc/conf/TADPOLE3GX
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.232 src/sys/arch/sparc/conf/GENERIC:1.233
--- src/sys/arch/sparc/conf/GENERIC:1.232 Sun Mar 11 06:18:46 2012
+++ src/sys/arch/sparc/conf/GENERIC Tue Jun 26 02:04:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.232 2012/03/11 06:18:46 nakayama Exp $
+# $NetBSD: GENERIC,v 1.233 2012/06/26 02:04:55 macallan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.232 $"
+#ident "GENERIC-$Revision: 1.233 $"
maxusers 32
@@ -51,8 +51,8 @@ options SUN4_MMU3L # sun4/400 3-level M
#options RASTERCONSOLE_BGCOL=WSCOL_WHITE
# wscons stuff
-options WSEMUL_SUN
-#options WSEMUL_VT100
+#options WSEMUL_SUN
+options WSEMUL_VT100
options WSDISPLAY_COMPAT_RAWKBD
options WSDISPLAY_CUSTOM_OUTPUT
options WS_DEFAULT_FG=WSCOL_BLACK
Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.81 src/sys/arch/sparc/conf/INSTALL:1.82
--- src/sys/arch/sparc/conf/INSTALL:1.81 Sun Mar 11 06:18:46 2012
+++ src/sys/arch/sparc/conf/INSTALL Tue Jun 26 02:04:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.81 2012/03/11 06:18:46 nakayama Exp $
+# $NetBSD: INSTALL,v 1.82 2012/06/26 02:04:55 macallan Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -49,8 +49,8 @@ options FONT_BOLD8x16 # a somewhat sma
#options RASTERCONSOLE_BGCOL=WSCOL_WHITE
# wscons stuff
-options WSEMUL_SUN
-#options WSEMUL_VT100
+#options WSEMUL_SUN
+options WSEMUL_VT100
options WSDISPLAY_COMPAT_RAWKBD
options WSDISPLAY_CUSTOM_OUTPUT
options WS_DEFAULT_FG=WSCOL_BLACK
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.59 src/sys/arch/sparc/conf/KRUPS:1.60
--- src/sys/arch/sparc/conf/KRUPS:1.59 Tue Jun 5 08:44:15 2012
+++ src/sys/arch/sparc/conf/KRUPS Tue Jun 26 02:04:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.59 2012/06/05 08:44:15 abs Exp $
+# $NetBSD: KRUPS,v 1.60 2012/06/26 02:04:55 macallan Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.59 $"
+#ident "KRUPS-$Revision: 1.60 $"
maxusers 32
@@ -74,7 +74,7 @@ options NFS_BOOT_DHCP
#### wscons options
# builtin terminal emulations
-options WSEMUL_SUN # sun terminal emulation
+#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSEMUL_DEFAULT="\"vt100\""
Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.36 src/sys/arch/sparc/conf/MRCOFFEE:1.37
--- src/sys/arch/sparc/conf/MRCOFFEE:1.36 Sun Mar 11 06:18:46 2012
+++ src/sys/arch/sparc/conf/MRCOFFEE Tue Jun 26 02:04:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.36 2012/03/11 06:18:46 nakayama Exp $
+# $NetBSD: MRCOFFEE,v 1.37 2012/06/26 02:04:55 macallan Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.36 $"
+#ident "MRCOFFEE-$Revision: 1.37 $"
maxusers 32
@@ -30,7 +30,7 @@ options SUN4M # sun4m - SS10, SS20, Cl
#options BLINK
# builtin terminal emulations
-options WSEMUL_SUN # sun terminal emulation
+#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSEMUL_DEFAULT="\"vt100\""
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.56 src/sys/arch/sparc/conf/TADPOLE3GX:1.57
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.56 Tue Jun 5 08:44:15 2012
+++ src/sys/arch/sparc/conf/TADPOLE3GX Tue Jun 26 02:04:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.56 2012/06/05 08:44:15 abs Exp $
+# $NetBSD: TADPOLE3GX,v 1.57 2012/06/26 02:04:55 macallan Exp $
include "arch/sparc/conf/std.sparc"
@@ -22,8 +22,8 @@ options SUN4M # sun4m - SS10, SS20, Cl
#options BLINK
# wsdisplay options
-options WSEMUL_SUN
-#options WSEMUL_VT100
+#options WSEMUL_SUN
+options WSEMUL_VT100
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_CUSTOM_OUTPUT # wsconsctl(8)
