summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-08-22 12:24:49 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-08-22 12:24:49 +0000
commitf15bb0153e962c4b51bde4a2b26ae7745a3f783b (patch)
tree99c8aeeec1c3ed9ebff40ea8fc45aed527667e91 /sys/arch
parent2855ae29fb4d1d9554c181c40b3de5fb6b62d374 (diff)
first steps toward pci
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/conf/GENERIC7
-rw-r--r--sys/arch/sparc64/conf/files.sparc6419
2 files changed, 19 insertions, 7 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 210fc659cff..2abd9c70552 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.9 2001/08/21 21:42:30 jason Exp $
+# $OpenBSD: GENERIC,v 1.10 2001/08/22 12:24:48 art Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -21,6 +21,11 @@ cpu0 at mainbus0
# Bus types found on SPARC systems.
sbus0 at mainbus0 # Ultra 1
+psycho* at mainbus0
+pci* at psycho? # Ultra 5
+pci* at ppb?
+ppb* at pci? dev ? function ?
+ebus* at pci?
#### Standard system devices -- all required for a given architecture
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 27e97fa55b3..8ba127a896d 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.8 2001/08/21 21:42:30 jason Exp $
+# $OpenBSD: files.sparc64,v 1.9 2001/08/22 12:24:48 art Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -20,13 +20,25 @@ file dev/ic/hme.c hme
include "dev/sun/files.sun"
include "dev/sbus/files.sbus"
+include "dev/i2o/files.i2o"
+include "dev/mii/files.mii"
attach sbus at mainbus
file arch/sparc64/dev/sbus.c sbus
+device psycho: pcibus
+attach psycho at mainbus
+include "dev/pci/files.pci"
+file arch/sparc64/dev/psycho.c psycho
+file arch/sparc64/dev/pci_machdep.c psycho
+
# IOMMU is for both
file arch/sparc64/dev/iommu.c sbus | psycho
+device ebus {[addr = -1]}: pcibus
+attach ebus at pci
+file arch/sparc64/dev/ebus.c ebus
+
device clock: mk48txx
attach clock at mainbus, sbus with clock_sbus
@@ -119,11 +131,6 @@ file arch/sparc64/sparc64/db_disasm.c ddb
file arch/sparc64/dev/md_root.c memory_disk_hooks
#
-# Media Indepedent Interface (mii)
-#
-include "../../../dev/mii/files.mii"
-
-#
# Machine-independent SCSI drivers
#
include "../../../scsi/files.scsi"