diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2002-01-03 21:59:00 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2002-01-03 21:59:00 +0000 |
| commit | 6a7325ccd3d30b0417f42712fbee2d9a50459495 (patch) | |
| tree | 3fbf4ce8af6197a06cc36393678c5d95a4d4899a /sys/arch | |
| parent | 1f5af93cdf91726621d22c1348aa6dab7bec7952 (diff) | |
define a new wsemul_sun attribute and add it to the sparc64 framebuffers
[This needs to be extended to the vt100 and dumb emulations too.. in time].
(This allows the removal of WSEMUL_SUN from sparc64/conf/GENERIC)
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/files.sparc64 | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 76ff7f9879c..3ee5eb1f07a 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2002/01/03 16:20:55 jason Exp $ +# $OpenBSD: GENERIC,v 1.36 2002/01/03 21:58:59 jason Exp $ # $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $ machine sparc64 @@ -9,7 +9,6 @@ option SUN4U option _LP64 option PCIVERBOSE -option WSEMUL_SUN maxusers 64 diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 216daafdbb6..4b585d64e28 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.22 2001/12/14 14:59:04 jason Exp $ +# $OpenBSD: files.sparc64,v 1.23 2002/01/03 21:58:59 jason Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -19,12 +19,12 @@ device hme: ether, ifnet, mii, ifmedia file dev/ic/hme.c hme include "dev/sun/files.sun" +include "dev/wscons/files.wscons" include "dev/sbus/files.sbus" include "dev/i2o/files.i2o" include "dev/mii/files.mii" include "dev/atapiscsi/files.atapiscsi" include "dev/ata/files.ata" -include "dev/wscons/files.wscons" # COMPAT_NETBSD include "compat/netbsd/files.netbsd" @@ -42,7 +42,7 @@ file arch/sparc64/dev/pci_machdep.c psycho attach hme at pci with hme_pci file dev/pci/if_hme_pci.c hme_pci -device vgafb: wsemuldisplaydev, wsrasteremulops +device vgafb: wsemuldisplaydev, wsrasteremulops, wsemul_sun attach vgafb at pci file arch/sparc64/dev/vgafb.c vgafb |