diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-02-25 16:59:25 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-02-25 16:59:25 +0000 |
| commit | 93aba1fae22f689c1dfee648096f82114902285d (patch) | |
| tree | 304033536bf0f5dc46fad77c3ae78dd48d4eca3a | |
| parent | 5adad651c079427bf28953786b84fb65c96e2319 (diff) | |
add dino device/attachment; myri is actually on pci
| -rw-r--r-- | sys/arch/hppa/conf/DISKLESS | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/files.hppa | 18 |
3 files changed, 22 insertions, 8 deletions
diff --git a/sys/arch/hppa/conf/DISKLESS b/sys/arch/hppa/conf/DISKLESS index 149d6871bce..a9e121cac05 100644 --- a/sys/arch/hppa/conf/DISKLESS +++ b/sys/arch/hppa/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.4 1999/02/25 16:48:06 mickey Exp $ +# $OpenBSD: DISKLESS,v 1.5 1999/02/25 16:59:24 mickey Exp $ # # Diskless kernel config # @@ -125,7 +125,6 @@ eba* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???) #dino* at mainbus0 irq ? # PCI bus adapter #sti* at mainbus0 irq ? # [H]CRX-{8,24,48}[Z] graphics -#myri* at mainbus0 irq ? # ANSI/VITA-26-1998 Gbit iface # internal i/o space gsc* at lasi? # 712,715/100,725/75,725/100 @@ -186,6 +185,9 @@ scsibus* at bha? #ie* at isa? port 0x360 iomem 0xd0000 irq 7 #ie* at isa? port 0x300 irq 10 +# PCI devices +#myri* at pci? dev ? function ? # ANSI/VITA-26-1998 Gbit iface + # MI devices option WSEMUL_DUMB #wsdisplay* at vgafb? diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index d251e84cc6d..313ac82f602 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.3 1999/02/25 16:48:06 mickey Exp $ +# $OpenBSD: GENERIC,v 1.4 1999/02/25 16:59:24 mickey Exp $ # # Generic kernel config (all that is supportted) # @@ -47,7 +47,6 @@ eba* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???) #dino* at mainbus0 irq ? # PCI bus adapter #sti* at mainbus0 irq ? # [H]CRX-{8,24,48}[Z] graphics -#myri* at mainbus0 irq ? # ANSI/VITA-26-1998 Gbit iface # internal i/o space gsc* at lasi? # 712,715/100,725/75,725/100 @@ -100,6 +99,9 @@ scsibus* at bha? #ie* at isa? port 0x360 iomem 0xd0000 irq 7 #ie* at isa? port 0x300 irq 10 +# PCI devices +#myri* at pci? dev ? function ? # ANSI/VITA-26-1998 Gbit iface + # MI devices option WSEMUL_DUMB #wsdisplay* at vgafb? diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa index 99b253ee751..52cc1684d7c 100644 --- a/sys/arch/hppa/conf/files.hppa +++ b/sys/arch/hppa/conf/files.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: files.hppa,v 1.10 1999/02/25 16:37:12 mickey Exp $ +# $OpenBSD: files.hppa,v 1.11 1999/02/25 16:59:24 mickey Exp $ # # hppa-specific configuration info @@ -44,6 +44,11 @@ include "dev/isa/files.isapnp" include "dev/eisa/files.eisa" # +# PCI Bus support +# +include "dev/pci/files.pci" + +# # General System Connect Bus # define gscbus { } @@ -85,6 +90,10 @@ device eba: eisabus attach eba at mainbus file arch/hppa/dev/eba.c eba +device dino: pcibus +attach dino at mainbus +file arch/hppa/dev/dino.c dino + device sti: wsemuldisplaydev attach sti at mainbus file arch/hppa/dev/sti.c sti @@ -150,10 +159,11 @@ file arch/hppa/gsc/atwo.c atwo #attach medusa at gsc #file arch/hppa/gsc/medusa.c medusa +# XXX should not be here # ANSI/VITA 26-1998 Gbit packet switching network iface -#device myri -#attach myri at gsc -#file arch/hppa/gsc/myri.c myri +#device myri: ether +#attach myri at pci +#file dev/pci/myri.c myri # # PC Keyboard controller (ps2) |