diff options
Diffstat (limited to 'sys/arch/sparc/conf')
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC_SCSI3 | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4C | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4M | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/files.sparc | 8 |
5 files changed, 30 insertions, 10 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 50aec35cbbe..b4148070dcc 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.40 1999/03/17 18:45:08 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.41 1999/04/18 03:24:22 jason Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -107,6 +107,10 @@ sbpp* at spif? bpp* at sbus? slot ? offset ? # parallel port +# SUNW,xbox SBus Expansion Subsystem +xbox* at sbus? slot ? offset ? # SBus Expansion box +sbus* at xbox? + # # Note the flags on the esp entries below, that work around # deficiencies in the current driver: @@ -171,7 +175,7 @@ nsphy* at mii? phy ? # NS and compatible PHYs qsphy* at mii? phy ? # Quality Semi QS6612 PHYs # Quad-ethernet glue device, and sub-devices -qec* at sbus0 slot ? offset ? +qec* at sbus? slot ? offset ? qe* at qec? be* at qec? diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3 index b492755dcfd..16fa695365e 100644 --- a/sys/arch/sparc/conf/GENERIC_SCSI3 +++ b/sys/arch/sparc/conf/GENERIC_SCSI3 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC_SCSI3,v 1.27 1999/03/01 04:56:04 jason Exp $ +# $OpenBSD: GENERIC_SCSI3,v 1.28 1999/04/18 03:24:22 jason Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -106,6 +106,10 @@ sbpp* at spif? bpp* at sbus? slot ? offset ? # parallel port +# SUNW,xbox SBus Expansion Subsystem +xbox* at sbus? slot ? offset ? # SBus Expansion box +sbus* at xbox? + # # Note the flags on the esp entries below, that work around # deficiencies in the current driver: @@ -167,7 +171,7 @@ nsphy* at mii? phy ? # NS and compatible PHYs qsphy* at mii? phy ? # Quality Semi QS6612 PHYs # Quad-ethernet glue device, and sub-devices -qec* at sbus0 slot ? offset ? +qec* at sbus? slot ? offset ? qe* at qec? be* at qec? diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index d5bc6cec5b2..1cffd9e966f 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.26 1999/02/01 00:31:57 jason Exp $ +# $OpenBSD: SUN4C,v 1.27 1999/04/18 03:24:22 jason Exp $ # $NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $ machine sparc @@ -98,6 +98,10 @@ spif* at sbus? slot ? offset ? # spif serial cards stty* at spif? sbpp* at spif? +# SUNW,xbox SBus Expansion Subsystem +xbox* at sbus? slot ? offset ? # SBus Expansion box +sbus* at xbox? + # FSBE/S or sun4m #espdma0 at sbus0 slot ? offset ? #espdma* at sbus0 slot ? offset ? @@ -124,7 +128,7 @@ nsphy* at mii? phy ? # NS and compatible PHYs qsphy* at mii? phy ? # Quality Semi QS6612 PHYs # Quad-ethernet glue device, and sub-devices -qec* at sbus0 slot ? offset ? +qec* at sbus? slot ? offset ? qe* at qec? be* at qec? diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index 174a37157eb..cdfa783b6d6 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.29 1999/03/17 05:34:15 mjacob Exp $ +# $OpenBSD: SUN4M,v 1.30 1999/04/18 03:24:22 jason Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -68,6 +68,10 @@ spif* at sbus? slot ? offset ? # spif serial cards stty* at spif? sbpp* at spif? +# SUNW,xbox SBus Expansion Subsystem +xbox* at sbus? slot ? offset ? # SBus Expansion box +sbus* at xbox? + # # Note the flags on the esp entries below, that work around # deficiencies in the current driver: @@ -110,7 +114,7 @@ nsphy* at mii? phy ? # NS and compatible PHYs qsphy* at mii? phy ? # Quality Semi QS6612 PHYs # Quad-ethernet glue device, and sub-devices -qec* at sbus0 slot ? offset ? +qec* at sbus? slot ? offset ? qe* at qec? be* at qec? diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index 54ac4b3a638..6504c77553c 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc,v 1.28 1999/03/17 05:34:14 mjacob Exp $ +# $OpenBSD: files.sparc,v 1.29 1999/04/18 03:24:23 jason Exp $ # $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 @@ -72,8 +72,9 @@ attach fd at fdc file arch/sparc/dev/fd.c fdc | fd needs-flag file arch/sparc/sparc/bsd_fdintr.s fdc +device xbox {} device sbus { slot = -1, offset = -1 } -attach sbus at mainbus, iommu +attach sbus at mainbus, iommu, sbus, xbox file arch/sparc/dev/sbus.c sbus # @@ -299,3 +300,6 @@ file arch/sparc/dev/spif.c spif | stty | sbpp needs-flag device bpp {} attach bpp at sbus file arch/sparc/dev/bpp.c bpp needs-flag + +attach xbox at sbus +file arch/sparc/dev/xbox.c xbox |