[src/trunk]: src/sys Move "podulebus" and "podloader" declarations up into fi...

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

details:   https://anonhg.NetBSD.org/src/rev/754e04ac83aa
branches:  trunk
changeset: 512054:754e04ac83aa
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Wed Jul 04 13:49:24 2001 +0000

description:
Move "podulebus" and "podloader" declarations up into files.podulebus.

diffstat:

 sys/arch/arm26/conf/files.arm26   |  12 +++++++-----
 sys/arch/arm32/conf/files.arm32   |   6 +++---
 sys/dev/podulebus/files.podulebus |  11 ++++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diffs (96 lines):

diff -r 96ff99a61ae0 -r 754e04ac83aa sys/arch/arm26/conf/files.arm26
--- a/sys/arch/arm26/conf/files.arm26   Wed Jul 04 13:38:36 2001 +0000
+++ b/sys/arch/arm26/conf/files.arm26   Wed Jul 04 13:49:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm26,v 1.32 2001/06/08 20:13:27 bjh21 Exp $
+# $NetBSD: files.arm26,v 1.33 2001/07/04 13:49:24 bjh21 Exp $
 
 # Copyright (c) 1997, 1998, 2000 Ben Harris
 # All rights reserved.
@@ -122,15 +122,15 @@
 attach arcpp at ioc
 file   arch/arm26/ioc/arcpp.c                  arcpp           needs-flag
 
+include "dev/podulebus/files.podulebus"
+
 # Podule interface (podules listed later) (usually at bank 4 irq 13 fiq 6)
 #  Unix backplanes also use bank 6
 #  MEMC podules also use the iobus directly
 # XXX How on Earth do we codify all that?
 device unixbp
 attach unixbp at ioc
-device podulebus { [slot = -1] }
 attach podulebus at ioc
-define podloader
 file   arch/arm26/podulebus/podulebus.c        podulebus
 file   arch/arm26/podulebus/podloader_asm.S    podloader       needs-flag
 file   arch/arm26/podulebus/unixbp.c           unixbp          needs-flag
@@ -170,13 +170,15 @@
 # Assorted podules
 #
 
-include "dev/podulebus/files.podulebus"
-
 # i-cubed EtherLAN 100, 200 and 500
 device eh: ether, ifnet, arp, dp8390nic, podloader
 attach eh at podulebus
 file   arch/arm26/podulebus/if_eh.c            eh
 
+# PowerROM test driver
+device powerrom: podloader
+attach powerrom at podulebus
+file   arch/arm26/podulebus/powerrom.c         powerrom
 
 # Memory disk for installation (or ROM versions?)
 file   dev/md_root.c                           memory_disk_hooks
diff -r 96ff99a61ae0 -r 754e04ac83aa sys/arch/arm32/conf/files.arm32
--- a/sys/arch/arm32/conf/files.arm32   Wed Jul 04 13:38:36 2001 +0000
+++ b/sys/arch/arm32/conf/files.arm32   Wed Jul 04 13:49:24 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm32,v 1.121 2001/07/02 23:18:34 bjh21 Exp $
+#      $NetBSD: files.arm32,v 1.122 2001/07/04 13:49:24 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -221,14 +221,14 @@
 file   arch/arm32/vidc/lmc1982.S               lmcaudio
 
 # Podule bus device
-device podulebus { [slot = -1] }
+include "dev/podulebus/files.podulebus"
+
 attach podulebus at root
 file   arch/arm32/podulebus/podulebus.c        podulebus needs-flag
 file   arch/arm32/podulebus/podulebus_io.c     podulebus
 file   arch/arm32/podulebus/podulebus_io_asm.S podulebus
 file   arch/arm32/podulebus/netslot.c          podulebus
 
-include "dev/podulebus/files.podulebus"
 
 # Ethernet devices
 
diff -r 96ff99a61ae0 -r 754e04ac83aa sys/dev/podulebus/files.podulebus
--- a/sys/dev/podulebus/files.podulebus Wed Jul 04 13:38:36 2001 +0000
+++ b/sys/dev/podulebus/files.podulebus Wed Jul 04 13:49:24 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: files.podulebus,v 1.10 2001/06/13 18:31:43 bjh21 Exp $
+# $NetBSD: files.podulebus,v 1.11 2001/07/04 13:49:24 bjh21 Exp $
+
+device podulebus { [slot = -1] }
+define podloader
 
 # Oak SCSI
 device oak: scsi, ncr5380sbc
@@ -10,6 +13,12 @@
 attach hcsc at podulebus
 file   dev/podulebus/hcsc.c                    hcsc
 
+# Castle EtherSCSI
+device ethsc { }
+attach ethsc at podulebus
+file   dev/podulebus/ethsc.c                   ethsc
+attach iy at ethsc with iy_ethsc
+
 # D.T. software IDE
 device dtide: wdc_base, ata, atapi
 attach dtide at podulebus