Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sparc64 Nuke options RASTERCONSOLE for sparc64
details: https://anonhg.NetBSD.org/src/rev/ddda03786978
branches: trunk
changeset: 574252:ddda03786978
user: martin <martin%NetBSD.org@localhost>
date: Fri Feb 25 19:16:45 2005 +0000
description:
Nuke options RASTERCONSOLE for sparc64
diffstat:
sys/arch/sparc64/conf/GENERIC32 | 25 ++++++++++---------------
sys/arch/sparc64/conf/NONPLUS | 10 +---------
sys/arch/sparc64/conf/POWEROFSEVEN.inc | 7 +------
sys/arch/sparc64/conf/SPLODE | 13 ++-----------
sys/arch/sparc64/dev/kd.c | 15 ++-------------
sys/arch/sparc64/sparc64/autoconf.c | 10 ++++++----
6 files changed, 22 insertions(+), 58 deletions(-)
diffs (220 lines):
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/conf/GENERIC32
--- a/sys/arch/sparc64/conf/GENERIC32 Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/conf/GENERIC32 Fri Feb 25 19:16:45 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC32,v 1.97 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: GENERIC32,v 1.98 2005/02/25 19:16:45 martin Exp $
include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.97 $"
+#ident "GENERIC-$Revision: 1.98 $"
maxusers 64
@@ -16,15 +16,6 @@
options SUN4U # sun4u - UltraSPARC
#options BLINK # blink the system LED
-## System options specific to the sparc machine type
-
-## Use a faster console than the PROM's slow drawing routines. Not needed
-## for headless (no framebuffer) machines.
-# XXX broken on sparc64
-#options RASTERCONSOLE # fast rasterop console
-#options FONT_GALLANT12x22 # the console font
-#options FONT_BOLD8x16 # a somewhat smaller font
-
#### System options that are the same for all ports
## Root device configuration: change the ?'s if you are going to use a
@@ -704,12 +695,16 @@
#cgthree* at sbus? slot ? offset ?
## Sun "cgsix" accelerated color framebuffer.
-cgsix0 at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
+wsdisplay* at cgsix?
-## Sun FFB not supported
-#ffb* at mainbus0
-#wsdisplay* at ffb?
+## Sun FFB
+ffb* at mainbus0
+wsdisplay* at ffb?
+
+# On board vga on U5/U10 etc.
+machfb* at pci?
+wsdisplay* at machfb?
#### Other device configuration
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS Fri Feb 25 19:16:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS,v 1.47 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: NONPLUS,v 1.48 2005/02/25 19:16:45 martin Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -17,14 +17,6 @@
#options __SWAP_BROKEN
makeoptions SPARC_BINARIES=1
-## System options specific to the sparc machine type
-
-## 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
-
#### System options that are the same for all ports
## Root device configuration: change the ?'s if you are going to use a
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/conf/POWEROFSEVEN.inc
--- a/sys/arch/sparc64/conf/POWEROFSEVEN.inc Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/conf/POWEROFSEVEN.inc Fri Feb 25 19:16:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: POWEROFSEVEN.inc,v 1.31 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: POWEROFSEVEN.inc,v 1.32 2005/02/25 19:16:45 martin Exp $
#
# from: NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp
#
@@ -19,11 +19,6 @@
## System options specific to the sparc machine type
-## Use a faster console than the PROM's slow drawing routines. Not needed
-## for headless (no framebuffer) machines.
-# XXX broken on sparc64
-#options RASTERCONSOLE # fast rasterop console
-
options BLINK # Blink the system LED
#### System options that are the same for all ports
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/conf/SPLODE
--- a/sys/arch/sparc64/conf/SPLODE Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/conf/SPLODE Fri Feb 25 19:16:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SPLODE,v 1.32 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: SPLODE,v 1.33 2005/02/25 19:16:45 martin Exp $
#
# Configuration for Ultra1, 32 bit mode.
@@ -6,7 +6,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
maxusers 256
@@ -18,15 +18,6 @@
options SUN4U # sun4u - UltraSPARC
options BLINK # blink the system LED
-## System options specific to the sparc machine type
-
-## Use a faster console than the PROM's slow drawing routines. Not needed
-## for headless (no framebuffer) machines.
-# XXX broken on sparc64
-#options RASTERCONSOLE # fast rasterop console
-#options FONT_GALLANT12x22 # the console font
-#options FONT_BOLD8x16 # a somewhat smaller font
-
#### System options that are the same for all ports
## Root device configuration: change the ?'s if you are going to use a
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/dev/kd.c
--- a/sys/arch/sparc64/dev/kd.c Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/dev/kd.c Fri Feb 25 19:16:45 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.32 2004/03/21 15:08:24 pk Exp $ */
+/* $NetBSD: kd.c,v 1.33 2005/02/25 19:16:45 martin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.32 2004/03/21 15:08:24 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.33 2005/02/25 19:16:45 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -64,12 +64,6 @@
#include <machine/kbd.h>
#include <machine/autoconf.h>
-#ifdef RASTERCONSOLE
-#include <dev/sun/fbio.h>
-#include <dev/sun/fbvar.h>
-#endif
-
-
#include <dev/cons.h>
#include <dev/sun/event_var.h>
#include <dev/sun/kbd_xlate.h>
@@ -143,11 +137,6 @@
*/
if (kd_is_console) {
fbconstty = tp;
-#ifdef RASTERCONSOLE
- kd->rows = fbrcons_rows();
- kd->cols = fbrcons_cols();
- rcons_ttyinit(tp);
-#endif
}
if (kd->rows == 0 &&
diff -r 01c23be7e0ed -r ddda03786978 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c Fri Feb 25 18:26:00 2005 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c Fri Feb 25 19:16:45 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.98 2004/10/23 17:12:23 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.99 2005/02/25 19:16:45 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98 2004/10/23 17:12:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.99 2005/02/25 19:16:45 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -93,6 +93,10 @@
#include <ddb/db_extern.h>
#endif
+#ifdef RASTERCONSOLE
+#error options RASTERCONSOLE is obsolete for sparc64 - remove it from your config file
+#endif
+
#include "ksyms.h"
struct evcnt intr_evcnts[] = {
@@ -750,7 +754,6 @@
mainbus_match, mainbus_attach, NULL, NULL);
-#ifdef RASTERCONSOLE
/*
* Try to figure out where the PROM stores the cursor row & column
* variables. Returns nonzero on error.
@@ -772,7 +775,6 @@
*colp = (int *)(col+4);
return (row == 0UL || col == 0UL);
}
-#endif /* RASTERCONSOLE */
#if 0
void callrom()
Home |
Main Index |
Thread Index |
Old Index