diff options
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 41 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 66 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU1 | 32 |
3 files changed, 107 insertions, 32 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 diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 49c31c6dba2..d9e2a36a0ef 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.33 2004/10/20 23:04:57 miod Exp $ +# $OpenBSD: RAMDISK,v 1.34 2004/10/20 23:11:01 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -40,6 +40,7 @@ fhc* at mainbus0 # Bus types found on SPARC systems. sbus* at mainbus0 # Ultra 1/E4500 psycho* at mainbus0 +upa0 at mainbus0 pci* at psycho? # Ultra 5 pci* at ppb? ppb* at pci? @@ -65,9 +66,6 @@ clock0 at fhc? rtc* at ebus? # DS1287/M5819 clock timer* at mainbus0 # Timer chip -## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console - ## Lance Ethernet - AMD7990 le* at sbus? ledma* at sbus? @@ -127,6 +125,66 @@ inphy* at mii? # Intel 82555 PHYs lxtphy* at mii? # Level1 LXT970 PHYs ukphy* at mii? # Unknown PHYs +# PCI USB Controllers +ohci* at pci? # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) + +# USB bus support +usb* at ohci? flags 0x1 +usb* at uhci? flags 0x1 + +# USB devices +uhub* at usb? # USB Hubs +uhub* at uhub? # USB Hubs +uhidev* at uhub? # Human Interface Devices +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? + +# SAB82532 based serial ports +sab* at ebus? +sabtty* at sab? + +# NS16550 based serial ports +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 +wskbd* at pckbd? # generic keyboard layer + +# 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? + +## PROM console driver -- if all else fails +pcons0 at mainbus0 # PROM console + pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index e2a9373c66e..c809a14dc58 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.10 2004/09/21 19:39:44 drahn Exp $ +# $OpenBSD: RAMDISKU1,v 1.11 2004/10/20 23:11:01 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -38,9 +38,6 @@ sbus* at mainbus0 # Ultra 1 clock* at sbus? # Mostek clock timer* at mainbus0 # Timer chip -## PROM console driver -- if all else fails -pcons0 at mainbus0 # PROM console - le* at sbus? # Lance Ethernet - AMD7990 ledma* at sbus? le* at ledma? @@ -78,5 +75,32 @@ nsphy* at mii? # NS and compatible PHYs qsphy* at mii? # Quality Semi QS6612 PHYs ukphy* at mii? # Unknown PHYs +# Z8530 based serial ports +zs* at sbus? +zstty* at zs? +zskbd* at zs? +wskbd* at zskbd? + +# Framebuffers +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 +wsdisplay* at creator? + +## PROM console driver -- if all else fails +pcons0 at mainbus0 # PROM console + pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback |