diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-08-21 22:18:30 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-08-21 22:18:30 +0000 |
| commit | c13550a3b88f2e386aeb30f5ba2dd776feb41c05 (patch) | |
| tree | 4d3889c471a53f8d7aedb2ee8535bd328decc0b0 | |
| parent | c077c59a174b4e2291589085072b7a7bfa9a626e (diff) | |
Recognize both VSIMM slots, and allow one cgfourteen to attach to each
of them.
| -rw-r--r-- | share/man/man4/man4.sparc/cgfourteen.4 | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4M | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/share/man/man4/man4.sparc/cgfourteen.4 b/share/man/man4/man4.sparc/cgfourteen.4 index f09d6c69106..9e59ee0eda1 100644 --- a/share/man/man4/man4.sparc/cgfourteen.4 +++ b/share/man/man4/man4.sparc/cgfourteen.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cgfourteen.4,v 1.12 2002/08/12 10:48:21 miod Exp $ +.\" $OpenBSD: cgfourteen.4,v 1.13 2002/08/21 22:18:27 miod Exp $ .\" $NetBSD: cgfourteen.4,v 1.3 1998/06/11 08:32:20 fair Exp $ .\" .\" Copyright (c) 1996 The President and Fellows of Harvard College. @@ -48,7 +48,8 @@ .Nm cgfourteen .Nd accelerated 8/24-bit color frame buffer .Sh SYNOPSIS -.Cd "cgfourteen0 at obio0" Pq "SS10-M and SS20" +.Cd "cgfourteen0 at obio0 addr 0x9c000000" Pq "SS10SX and SS20" +.Cd "cgfourteen1 at obio0 addr 0x90000000" Pq "SS10SX and SS20 .Cd "wsdisplay* at cgfourteen?" .Sh DESCRIPTION The diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 0a56ca02726..144990f3914 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.53 2002/08/12 10:44:03 miod Exp $ +# $OpenBSD: GENERIC,v 1.54 2002/08/21 22:18:29 miod Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -260,7 +260,8 @@ tcx* at sbus? slot ? offset ? wsdisplay* at tcx? # Sun "cgfourteen" accelerated 24-bit framebuffer. -cgfourteen0 at obio0 # sun4m +cgfourteen0 at obio0 addr 0x9c000000 # sun4m +cgfourteen1 at obio0 addr 0x90000000 # sun4m wsdisplay* at cgfourteen? # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer. diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 64e49c38842..1b7747c4824 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.31 2002/08/12 10:44:03 miod Exp $ +# $OpenBSD: RAMDISK,v 1.32 2002/08/21 22:18:29 miod Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -254,7 +254,8 @@ tcx* at sbus? slot ? offset ? wsdisplay* at tcx? # Sun "cgfourteen" accelerated 24-bit framebuffer. -cgfourteen0 at obio0 # sun4m +cgfourteen0 at obio0 addr 0x9c000000 # sun4m +cgfourteen1 at obio0 addr 0x90000000 # sun4m wsdisplay* at cgfourteen? # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer. diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index c2d507f3184..f57155c11f9 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.41 2002/08/12 10:44:03 miod Exp $ +# $OpenBSD: SUN4M,v 1.42 2002/08/21 22:18:29 miod Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -144,7 +144,8 @@ tcx* at sbus? slot ? offset ? wsdisplay* at tcx? # Sun "cgfourteen" accelerated 24-bit framebuffer. -cgfourteen0 at obio0 # sun4m +cgfourteen0 at obio0 addr 0x9c000000 # sun4m +cgfourteen1 at obio0 addr 0x90000000 # sun4m wsdisplay* at cgfourteen? # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer. |