summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-06-02 13:53:44 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-06-02 13:53:44 +0000
commit3f99fc9e5f05c0271b71b2d876dd259a3737ea30 (patch)
treec2840a301af2caa0d49cf1385a62a7d694f6ec60 /sys/arch/macppc/conf
parent73f628d56fbf680e40ada4d32b8c8261093a654b (diff)
Add a new HT-PCI bridge driver and the necessary glue to openpic(4)
to get interrupts working on U4 machines. With this OpenBSD can run on PowerMac11,2 (Quad G5). With inputs from and ok kettenis@, miod@, dlg@
Diffstat (limited to 'sys/arch/macppc/conf')
-rw-r--r--sys/arch/macppc/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/files.macppc9
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index b5cb4f3a3f2..dbfab3c4d36 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.250 2015/05/30 18:14:08 jsg Exp $g
+# $OpenBSD: GENERIC,v 1.251 2015/06/02 13:53:43 mpi Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -46,7 +46,9 @@ smu* at mainbus0
pci* at mpcpcibr?
pci* at ht?
ppb* at pci? # PCI-PCI bridges
+hpb* at pci?
pci* at ppb?
+pci* at hpb?
siop* at pci?
fxp* at pci?
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 28c6cd7d6ec..9aa971eebc1 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.81 2015/05/11 06:46:21 ratchov Exp $
+# $OpenBSD: files.macppc,v 1.82 2015/06/02 13:53:43 mpi Exp $
#
# macppc-specific configuration info
@@ -86,7 +86,12 @@ include "dev/wscons/files.wscons"
#file arch/macppc/pci/bandit.c pci
-#PCI-Host bridge chipsets
+# HT bridge
+device hpb {} : pcibus
+attach hpb at pci
+file arch/macppc/pci/hpb.c hpb needs-flag
+
+# PCI-Host bridge chipsets
device pchb: agpbus
attach pchb at pci
file arch/macppc/pci/pchb.c pchb