From 285788209b1189f8dec33d9db3b5e5f1d874b6d3 Mon Sep 17 00:00:00 2001
From: macallan <macallan@NetBSD.org>
Date: Wed, 13 Apr 2016 17:32:27 +0000
Subject: [PATCH] - purge long obsolete RASTERCONSOLE - add mgx

---
 sys/arch/sparc/conf/GENERIC | 19 ++++++++-----------
 sys/arch/sparc/conf/INSTALL | 15 ++++++---------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 1bc786e090b0..903de38d196a 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.249 2015/09/26 11:16:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.250 2016/04/13 17:32:27 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.249 $"
+#ident 		"GENERIC-$Revision: 1.250 $"
 
 maxusers	32
 
@@ -43,13 +43,6 @@ options 	SUN4_MMU3L	# sun4/400 3-level MMU
 # Blink the power LED on some machines to indicate the system load.
 #options 	BLINK
 
-## Use a faster console than the PROM's slow drawing routines.  Not needed
-## for headless (no framebuffer) machines.
-## These is obsolete for wscons kernels
-#options 	RASTERCONSOLE		# fast rasterop console
-#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
-#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
-
 # wscons stuff
 #options 	WSEMUL_SUN
 options 	WSEMUL_VT100
@@ -65,7 +58,6 @@ options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
 
 options 	WSDISPLAY_SCROLLSUPPORT
 
-# generic options vlid for both wscons and RASTERCONSOLE
 options 	FONT_GALLANT12x22	# the console font
 options 	FONT_BOLD8x16		# a somewhat smaller font
 
@@ -688,8 +680,10 @@ cgsix0		at obio0 addr 0x0b000000 level 4	# sun4/100 P4
 tcx0		at sbus? slot ? offset ?
 
 ## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer
-## runs monochrome only for now
 cgtwelve*	at sbus? slot ? offset ?
+# the driver can use the color framebuffer or the monochrome overlay
+# the latter is faster
+options 	CG12_COLOR
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
 cgfourteen*	at obio0			# sun4m
@@ -707,6 +701,9 @@ zx*		at sbus? slot ? offset ?
 # Fujitsu AG-10e accelerated graphics 8/24-bit board
 agten*	at sbus? slot ? offset ?
 
+## Southland Media Systems (now Quantum 3D) MGX
+mgx* 		at sbus? slot ? offset ?
+
 # generic framebuffer console
 genfb*	at sbus? slot ? offset ?
 
diff --git a/sys/arch/sparc/conf/INSTALL b/sys/arch/sparc/conf/INSTALL
index e854a51920fe..7e6cda9f9efd 100644
--- a/sys/arch/sparc/conf/INSTALL
+++ b/sys/arch/sparc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.91 2015/09/26 11:16:13 maxv Exp $
+#	$NetBSD: INSTALL,v 1.92 2016/04/13 17:32:27 macallan Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -40,14 +40,6 @@ options 	SUN4_MMU3L	# 3-level MMU on sun4/400
 # Blink the power LED on some machines to indicate the system load.
 #options 	BLINK
 
-## Use a faster console than the PROM's slow drawing routines.  Not needed
-## for headless (no framebuffer) machines.
-#options 	RASTERCONSOLE		# fast rasterop console
-options 	FONT_GALLANT12x22	# the console font
-options 	FONT_BOLD8x16		# a somewhat smaller font
-#options 	RASTERCONSOLE_FGCOL=WSCOL_BLACK
-#options 	RASTERCONSOLE_BGCOL=WSCOL_WHITE
-
 # wscons stuff
 #options 	WSEMUL_SUN
 options 	WSEMUL_VT100
@@ -59,6 +51,8 @@ options 	WS_DEFAULT_FG=WSCOL_BLACK
 options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
 options 	WS_KERNEL_FG=WSCOL_GREEN
 options 	WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options 	FONT_GALLANT12x22	# the console font
+options 	FONT_BOLD8x16		# a somewhat smaller font
 
 #### System options that are the same for all ports
 
@@ -573,6 +567,9 @@ zx*		at sbus? slot ? offset ?
 # Fujitsu AG-10e accelerated graphics 8/24-bit board
 agten*	at sbus? slot ? offset ?
 
+## Southland Media Systems (now Quantum 3D) MGX
+mgx* 		at sbus? slot ? offset ?
+
 # generic framebuffer console
 genfb*	at sbus? slot ? offset ?