[src/trunk]: src/sys/arch/mvme68k/conf memc attaches at mainbus now.

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/70f8f5a1aa7f
branches:  trunk
changeset: 513282:70f8f5a1aa7f
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jul 27 18:40:27 2001 +0000

description:
memc attaches at mainbus now.

diffstat:

 sys/arch/mvme68k/conf/GENERIC       |  6 +++---
 sys/arch/mvme68k/conf/RAMDISK       |  3 ++-
 sys/arch/mvme68k/conf/VME162        |  6 ++++--
 sys/arch/mvme68k/conf/VME167        |  6 ++++--
 sys/arch/mvme68k/conf/VME172        |  6 ++++--
 sys/arch/mvme68k/conf/VME177        |  6 ++++--
 sys/arch/mvme68k/conf/files.mvme68k |  4 ++--
 7 files changed, 23 insertions(+), 14 deletions(-)

diffs (166 lines):

diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/GENERIC
--- a/sys/arch/mvme68k/conf/GENERIC     Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/GENERIC     Fri Jul 27 18:40:27 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: GENERIC,v 1.26 2001/07/08 16:32:20 abs Exp $
+#      $NetBSD: GENERIC,v 1.27 2001/07/27 18:40:27 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
-#ident                 "GENERIC-$Revision: 1.26 $"
+#ident                 "GENERIC-$Revision: 1.27 $"
 
 # Boards this kernel supports
 options        MVME147
@@ -97,7 +97,7 @@
 # MVME16x and MVME17x shared devices
 pcctwo0                at mainbus0
 vmetwo0        at mainbus0
-memc*          at pcctwo? ipl 6
+memc*          at mainbus0
 clock0         at pcctwo? ipl 5
 ie0            at pcctwo? ipl 3
 osiop0         at pcctwo? ipl 2
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/RAMDISK
--- a/sys/arch/mvme68k/conf/RAMDISK     Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/RAMDISK     Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: RAMDISK,v 1.9 2001/07/03 17:36:01 scw Exp $
+#      $NetBSD: RAMDISK,v 1.10 2001/07/27 18:40:27 scw Exp $
 
 #
 # RAMDISK: Root/swap on ramdisk
@@ -66,6 +66,7 @@
 
 # MVME1x2 and MVME1x7 shared devices
 pcctwo0                at mainbus0
+memc*          at mainbus0
 clock0         at pcctwo? ipl 5
 ie0            at pcctwo? ipl 3
 osiop0         at pcctwo? ipl 2
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/VME162
--- a/sys/arch/mvme68k/conf/VME162      Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/VME162      Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: VME162,v 1.8 2001/07/08 16:32:21 abs Exp $
+#      $NetBSD: VME162,v 1.9 2001/07/27 18:40:27 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
@@ -63,7 +63,6 @@
 mainbus0       at root
 
 pcctwo0                at mainbus0
-memc*          at pcctwo? ipl 6
 clock0         at pcctwo? ipl 5
 zsc*           at pcctwo? ipl 4
 ie0            at pcctwo? ipl 3
@@ -78,6 +77,9 @@
 # Example VMEbus device
 #foo0          at vme0 addr 0x10001000 am 0x0d irq 3 vect 0x80
 
+# Memory Controller Support (MCECC and MEMC040)
+memc*          at mainbus0
+
 # SCSI Bus Support
 scsibus*       at osiop?
 
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/VME167
--- a/sys/arch/mvme68k/conf/VME167      Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/VME167      Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: VME167,v 1.12 2001/07/08 16:32:21 abs Exp $
+#      $NetBSD: VME167,v 1.13 2001/07/27 18:40:27 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
@@ -63,7 +63,6 @@
 mainbus0       at root
 
 pcctwo0                at mainbus0
-memc*          at pcctwo? ipl 6
 clock0         at pcctwo? ipl 5
 clmpcc0                at pcctwo? ipl 4
 ie0            at pcctwo? ipl 3
@@ -77,6 +76,9 @@
 # Example VMEbus device
 #foo0          at vme0 addr 0x10001000 am 0x0d irq 3 vect 0x80
 
+# Memory Controller Support (MCECC and MEMC040)
+memc*          at mainbus0
+
 # SCSI Bus Support
 scsibus*       at osiop?
 
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/VME172
--- a/sys/arch/mvme68k/conf/VME172      Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/VME172      Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: VME172,v 1.8 2001/07/08 16:32:21 abs Exp $
+#      $NetBSD: VME172,v 1.9 2001/07/27 18:40:28 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
@@ -61,7 +61,6 @@
 mainbus0       at root
 
 pcctwo0                at mainbus0
-memc*          at pcctwo? ipl 6
 clock0         at pcctwo? ipl 5
 zsc*           at pcctwo? ipl 4
 ie0            at pcctwo? ipl 3
@@ -76,6 +75,9 @@
 # Example VMEbus device
 #foo0          at vme0 addr 0x10001000 am 0x0d irq 3 vect 0x80
 
+# Memory Controller Support (MCECC and MEMC040)
+memc*          at mainbus0
+
 # SCSI Bus Support
 scsibus*       at osiop?
 
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/VME177
--- a/sys/arch/mvme68k/conf/VME177      Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/VME177      Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: VME177,v 1.8 2001/07/08 16:32:21 abs Exp $
+#      $NetBSD: VME177,v 1.9 2001/07/27 18:40:28 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
@@ -61,7 +61,6 @@
 mainbus0       at root
 
 pcctwo0                at mainbus0
-memc*          at pcctwo? ipl 6
 clock0         at pcctwo? ipl 5
 clmpcc0                at pcctwo? ipl 4
 ie0            at pcctwo? ipl 3
@@ -75,6 +74,9 @@
 # Example VMEbus device
 #foo0          at vme0 addr 0x10001000 am 0x0d irq 3 vect 0x80
 
+# Memory Controller Support (MCECC and MEMC040)
+memc*          at mainbus0
+
 # SCSI Bus Support
 scsibus*       at osiop?
 
diff -r 091b3c9a1f78 -r 70f8f5a1aa7f sys/arch/mvme68k/conf/files.mvme68k
--- a/sys/arch/mvme68k/conf/files.mvme68k       Fri Jul 27 18:38:54 2001 +0000
+++ b/sys/arch/mvme68k/conf/files.mvme68k       Fri Jul 27 18:40:27 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.mvme68k,v 1.45 2001/07/06 19:00:12 scw Exp $
+#      $NetBSD: files.mvme68k,v 1.46 2001/07/27 18:40:28 scw Exp $
 
 # config file for mvme68k
 
@@ -85,7 +85,7 @@
 
 # MVME16x and MVME17x Memory Controller ASICs
 device memc
-attach memc at pcctwo
+attach memc at mainbus
 file arch/mvme68k/dev/memc.c                   memc
 
 # Memory disk for boot tape