summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-08-22 13:54:57 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-08-22 13:54:57 +0000
commit2cd41cc1f13fa88942df34362b48a79c93626029 (patch)
treec33c0a8241df627f75bc8a1819bb228a8b4400cd /sys
parenteda58fd4cfe7e996d63b079bef75839039810bc5 (diff)
clock at ebus, auxio at ebus, PCIVERBOSE
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/conf/GENERIC6
-rw-r--r--sys/arch/sparc64/conf/files.sparc6412
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 2abd9c70552..7c59a875934 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.10 2001/08/22 12:24:48 art Exp $
+# $OpenBSD: GENERIC,v 1.11 2001/08/22 13:54:56 art Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -9,6 +9,7 @@ option SUN4U
option _LP64
option DDB_SAFE_CONSOLE # XXX - remove later
+option PCIVERBOSE
maxusers 64
@@ -29,6 +30,8 @@ ebus* at pci?
#### Standard system devices -- all required for a given architecture
+auxio* at ebus?
+
zs* at sbus? slot ? offset ?
zstty* at zs? channel ?
@@ -37,6 +40,7 @@ pcons0 at mainbus0 # PROM console
## Mostek clock
clock* at sbus? slot ? offset ?
+clock* at ebus?
## Timer chip found on (some) sun4u systems.
timer* at mainbus0
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 8ba127a896d..77b47fa6fbc 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.9 2001/08/22 12:24:48 art Exp $
+# $OpenBSD: files.sparc64,v 1.10 2001/08/22 13:54:56 art Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -41,12 +41,13 @@ file arch/sparc64/dev/ebus.c ebus
device clock: mk48txx
attach clock at mainbus, sbus with clock_sbus
+attach clock at ebus with clock_ebus
device timer
attach timer at mainbus, sbus
device eeprom
-attach eeprom at sbus
+attach eeprom at sbus, ebus
file arch/sparc64/sparc64/clock.c
file dev/clock_subr.c
@@ -54,6 +55,11 @@ device cpu
attach cpu at mainbus
file arch/sparc64/sparc64/cpu.c
+device auxio
+attach auxio at ebus with auxio_ebus
+attach auxio at sbus with auxio_sbus
+file arch/sparc64/dev/auxio.c auxio
+
#
# Console related stuff
#
@@ -66,7 +72,7 @@ file arch/sparc64/dev/z8530sc.c zs
define zstty {}
device zstty: tty
attach zstty at zs
-file arch/sparc64/dev/z8530tty.c zstty needs-flag
+file arch/sparc64/dev/z8530tty.c zstty needs-flag
device kbd
attach kbd at zs with kbd_zs