diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-10-20 23:11:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-10-20 23:11:02 +0000 |
| commit | 918bb1d8e0aa17a16eb98a284b01b196b57097b3 (patch) | |
| tree | 4ce2d46d3ad630119a7206d4319a84653b13e767 /sys/arch/sparc64/conf/GENERIC | |
| parent | c7b491d05a0a328a637eafe9c2f5bd6d9f995399 (diff) | |
Provide real console drivers on installation media, and deem pcons obsolete
(I still need to port a few SBUS video drivers from sparc to sparc64 for
pcons to become really really unlikely used).
GENERIC is just being reordered, RAMDISK* get the real additions, and it
still fits even on the U1/1E/2 floppy disk.
Diffstat (limited to 'sys/arch/sparc64/conf/GENERIC')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 9046602d8d5..5bf990150bd 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.107 2004/10/20 23:04:57 miod Exp $ +# $OpenBSD: GENERIC,v 1.108 2004/10/20 23:11:01 miod Exp $ # $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $ machine sparc64 @@ -29,11 +29,11 @@ fhc* at mainbus0 # Bus types found on SPARC systems. -sbus* at mainbus0 # Ultra 1/E4500 +sbus* at mainbus0 psycho* at mainbus0 -pci* at psycho? # +pci* at psycho? schizo* at mainbus0 -pci* at schizo? # +pci* at schizo? pci* at ppb? ppb* at pci? ebus* at pci? @@ -57,10 +57,6 @@ scsibus* at siop? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel option ISP_COMPILE_FW=1 -# PCI Display -vgafb* at pci? -wsdisplay* at vgafb? - # PCI crypto hifn* at pci? # Hifn 7751/7811/7951 #nofn* at pci? # Hifn 7814/7851/7854 @@ -161,6 +157,13 @@ com* at ebus? comkbd* at ebus? wskbd* at comkbd? +# Z8530 based serial ports +zs* at sbus? +zs* at fhc? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? + # i8042 based serial ports (PS/2 ports) pckbc* at ebus? # controller pckbd* at pckbc? # ps2 keyboard @@ -179,12 +182,6 @@ lpt* at ebus? uperf* at ebus? uperf* at sbus? -zs* at sbus? -zs* at fhc? -zstty* at zs? -zskbd* at zs? -wskbd* at zskbd? - ## PROM console driver -- if all else fails pcons0 at mainbus0 # PROM console @@ -271,26 +268,26 @@ lxtphy* at mii? # Level1 LXT970 PHYs rlphy* at mii? # RealTek 8139 internal PHYs ukphy* at mii? # Unknown PHYs +# Framebuffers +vgafb* at pci? # PCI display +wsdisplay* at vgafb? bwtwo* at sbus? # bw2, sbus mono framebuffer wsdisplay* at bwtwo? - cgsix* at sbus? # cg6, sbus color framebuffer wsdisplay* at cgsix? - cgthree* at sbus? # cg3, sbus color framebuffer wsdisplay* at cgthree? - zx* at sbus? # Sun Leo (ZX) framebuffer wsdisplay* at zx? - rfx* at sbus? # RasterFlex framebuffer series wsdisplay* at rfx? - mgx* at sbus? # SMS MGX/MGXPlus framebuffer wsdisplay* at mgx? - agten* at sbus? # Fujitsu AG-10e framebuffer wsdisplay* at agten? +creator* at mainbus0 +creator* at upa0 +wsdisplay* at creator? audiocs* at sbus? @@ -305,10 +302,6 @@ pcmcia* at stp? wi* at pci? # WaveLAN IEEE 802.11DS wi* at pcmcia? # WaveLAN IEEE 802.11DS -creator* at mainbus0 -creator* at upa0 -wsdisplay* at creator? - #pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices |