default more wscons options

11 files changed, 11 insertions, 42 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 349d2a0726e..4d5a7829414 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.64 2001/01/27 21:17:06 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.65 2001/02/13 14:50:33 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -38,8 +38,6 @@ option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
 #option		USBVERBOSE
 
-option		WSEMUL_VT100		# wscons VT100 emulation
-
 config		bsd	swap generic
 
 mainbus0 at	root
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index f774465443a..041076f93de 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.38 2001/02/05 21:41:24 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.39 2001/02/13 14:50:33 deraadt Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -36,8 +36,6 @@ option		INET		# Internet protocol suite
 #option		TCVERBOSE		# recognize "unknown" TC devices
 option		SCSITERSE		# less verbose scsi error messages
 
-option		WSEMUL_VT100		# wscons VT100 emulation
-
 option		BOOT_CONFIG
 
 config		bsd	swap generic
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 8045f598630..72edcc8b205 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.2 2001/02/05 21:41:25 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.3 2001/02/13 14:50:33 deraadt Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -37,8 +37,6 @@ option		INET		# Internet protocol suite
 #option		TCVERBOSE		# recognize "unknown" TC devices
 option		SCSITERSE		# less verbose scsi error messages
 
-option		WSEMUL_VT100		# wscons VT100 emulation
-
 option		BOOT_CONFIG
 
 config		bsd	swap generic
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 737490c0721..214009f6437 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.3 2001/02/09 14:48:54 art Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.4 2001/02/13 14:50:33 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -42,8 +42,6 @@ option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
 #option		USBVERBOSE
 
-option		WSEMUL_VT100		# wscons VT100 emulation
-
 config		bsd	swap generic
 
 mainbus0 at	root
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a21a9336ff6..6e89e42bff5 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.236 2001/01/30 19:54:05 aaron Exp $
+#	$OpenBSD: GENERIC,v 1.237 2001/02/13 14:50:33 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -119,11 +119,6 @@ npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-option	WSEMUL_VT100			# VT100 / VT220 emulation
-option	WS_KERNEL_FG=WSCOL_WHITE
-option	WS_KERNEL_BG=WSCOL_BLUE
-option	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
-option	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
 option	WSDISPLAY_COMPAT_USL		# VT handling
 option	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 option	WSDISPLAY_DEFAULTSCREENS=6
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 76583ea57f7..ef808ee1552 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.96 2001/01/30 00:01:21 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.97 2001/02/13 14:50:33 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -81,10 +81,6 @@ npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-option	WSEMUL_VT100			# VT100 / VT220 emulation
-option	WS_KERNEL_FG=WSCOL_WHITE
-option	WS_KERNEL_BG=WSCOL_BLUE
-
 pckbc0		at isa?			# PC keyboard controller
 pckbd*		at pckbc?		# PC keyboard
 wskbd*		at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index cf6f26ee06b..c1a4a7413bf 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.29 2001/01/30 00:01:21 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.30 2001/02/13 14:50:33 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -81,10 +81,6 @@ npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-option	WSEMUL_VT100			# VT100 / VT220 emulation
-option	WS_KERNEL_FG=WSCOL_WHITE
-option	WS_KERNEL_BG=WSCOL_BLUE
-
 pckbc0		at isa?			# PC keyboard controller
 pckbd*		at pckbc?		# PC keyboard
 wskbd*		at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 7c19d1dc070..52a2757841d 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.11 2001/01/30 00:01:22 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.12 2001/02/13 14:50:33 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -87,10 +87,6 @@ npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-option	WSEMUL_VT100			# VT100 / VT220 emulation
-option	WS_KERNEL_FG=WSCOL_WHITE
-option	WS_KERNEL_BG=WSCOL_BLUE
-
 pckbc0		at isa?			# PC keyboard controller
 pckbd*		at pckbc?		# PC keyboard
 wskbd*		at pckbd? console ?
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 16696459700..01a80d3a900 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.28 2001/01/30 00:01:22 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.29 2001/02/13 14:50:33 deraadt Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -87,10 +87,6 @@ npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-option	WSEMUL_VT100			# VT100 / VT220 emulation
-option	WS_KERNEL_FG=WSCOL_WHITE
-option	WS_KERNEL_BG=WSCOL_BLUE
-
 pckbc0		at isa?			# PC keyboard controller
 pckbd*		at pckbc?		# PC keyboard
 wskbd*		at pckbd? console ?
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 5d8c2dc56a8..12d0e2eff58 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.23 2001/02/04 10:07:02 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.24 2001/02/13 14:50:33 deraadt Exp $
 #
 # PPC GENERIC config file
 #
@@ -14,7 +14,6 @@ option		SYS_TYPE=APPL
 option		FIREPOWERBUGS
 option		PPC_MPC106_BUG
 option		PCIVERBOSE
-option		WSEMUL_VT100
 option		WSEMUL_NO_DUMB
 
 include "../../../conf/GENERIC"
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 380cd4ca481..fe602102501 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.11 2000/12/07 18:19:31 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.12 2001/02/13 14:50:33 deraadt Exp $
 #
 # PPC GENERIC config file
 #
@@ -14,7 +14,6 @@ option		SYS_TYPE=APPL
 option		FIREPOWERBUGS
 option		PPC_MPC106_BUG
 option		PCIVERBOSE
-option		WSEMUL_VT100
 option		WSEMUL_NO_DUMB
 
 # include "../../../conf/GENERIC"