summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-09-21 19:19:58 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-09-21 19:19:58 +0000
commit21eb5d7c5ee2d46c2ba852c5bf0698ed9c8a4f8e (patch)
tree36f139dfe97a5b4e74f3d7a671c0550a54116ef7
parente008596bbbcbd2a63812793a786973166d6d991e (diff)
Allow for multiple sbus host bridges. eg, on e4500. from jason, ok miod
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index d8ed4523d00..1a3589aa5e5 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.100 2004/09/18 06:41:33 pvalchev Exp $
+# $OpenBSD: GENERIC,v 1.101 2004/09/21 19:19:57 drahn Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -24,7 +24,7 @@ upa0 at mainbus0
# Bus types found on SPARC systems.
-sbus0 at mainbus0 # Ultra 1
+sbus* at mainbus0 # Ultra 1/E4500
psycho* at mainbus0
pci* at psycho? #
schizo* at mainbus0
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 043f18c71dd..a712da69dd5 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.30 2004/09/16 09:35:37 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.31 2004/09/21 19:19:57 drahn Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -34,7 +34,7 @@ mainbus0 at root
cpu0 at mainbus0
# Bus types found on SPARC systems.
-sbus0 at mainbus0 # Ultra 1
+sbus* at mainbus0 # Ultra 1/E4500
psycho* at mainbus0
pci* at psycho? # Ultra 5
pci* at ppb?