[src/trunk]: src/sys/arch/evbarm/conf Move board-specific config definitions ...

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

details:   https://anonhg.NetBSD.org/src/rev/97b115ea7a3b
branches:  trunk
changeset: 516984:97b115ea7a3b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Nov 04 02:20:22 2001 +0000

description:
Move board-specific config definitions into files.<board>, allowing
each board type to have its own device namespace.

diffstat:

 sys/arch/evbarm/conf/files.evbarm     |  50 +----------------------------------
 sys/arch/evbarm/conf/files.integrator |  36 +++++++++++++++++++++++++
 sys/arch/evbarm/conf/files.iq80310    |   9 ++++++
 sys/arch/evbarm/conf/std.integrator   |   5 ++-
 sys/arch/evbarm/conf/std.iq80310      |   5 ++-
 5 files changed, 54 insertions(+), 51 deletions(-)

diffs (180 lines):

diff -r 2639b631ac80 -r 97b115ea7a3b sys/arch/evbarm/conf/files.evbarm
--- a/sys/arch/evbarm/conf/files.evbarm Sun Nov 04 01:36:18 2001 +0000
+++ b/sys/arch/evbarm/conf/files.evbarm Sun Nov 04 02:20:22 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.evbarm,v 1.2 2001/10/27 16:10:12 rearnsha Exp $
+#      $NetBSD: files.evbarm,v 1.3 2001/11/04 02:20:22 thorpej Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -21,9 +21,6 @@
 include "dev/rasops/files.rasops"
 include "dev/wsfont/files.wsfont"
 
-# Include arm32 XScale support
-include "arch/arm/conf/files.xscale"
-
 #
 # Machine-independent ATA drivers
 #
@@ -53,14 +50,6 @@
 file   arch/arm32/dev/todclock.c               todclock        needs-count
 
 #
-# IQ80310 specific devices
-#
-define clock
-device clock
-attach clock at obio with clock_obio
-attach com at obio with com_obio
-
-#
 # Machine-independent SCSI drivers
 #
 
@@ -70,13 +59,6 @@
 
 # Generic MD files
 file   arch/evbarm/evbarm/autoconf.c
-file   arch/evbarm/iq80310/iq80310_machdep.c   iq80310
-file   arch/evbarm/iq80310/obio_machdep.c      obio & iq80310
-file   arch/evbarm/iq80310/com_obio.c          com_obio
-file   arch/evbarm/iq80310/clock_obio.c        clock_obio
-
-file   arch/evbarm/integrator/integrator_machdep.c     integrator
-file   arch/evbarm/integrator/int_bus_dma.c            integrator
 file   arch/arm/arm32/conf.c
 
 file   arch/arm/arm/disksubr.c                 disk
@@ -88,35 +70,7 @@
 file   arch/arm32/fpe-arm/armfpe_init.c        armfpe
 file   arch/arm32/fpe-arm/armfpe.s             armfpe
 
-# Integrator fpga specific files
-# Integrator fpga specific files
-device ifpga {[offset = -1], [irq = -1]}: pcibus
-attach ifpga at mainbus
-file   arch/evbarm/ifpga/ifpga.c                       ifpga
-file   arch/evbarm/ifpga/ifpga_io.c            ifpga
-file   arch/evbarm/ifpga/ifpga_io_asm.S                ifpga
-file   arch/evbarm/ifpga/ifpga_clock.c         ifpga
-file   arch/evbarm/ifpga/ifpga_irq.S           ifpga
-file   arch/evbarm/ifpga/ifpga_irqhandler.c    ifpga
-file   arch/evbarm/ifpga/ifpga_pci.c           ifpga & pci
-
-# Integrator fpga serial port
-defopt opt_plcom.h     PLCOM_DEBUG PLCOM_MPLOCK
-device plcom { } : tty
-file   arch/evbarm/dev/plcom.c                 plcom needs-flag
-
-attach plcom at ifpga with plcom_ifpga
-file   arch/evbarm/ifpga/plcom_ifpga.c         plcom_ifpga
-#file  arch/evbarm/ifpga/pl010_uart_io.c               plcom
-#file  arch/evbarm/ifpga/pl010_uart_io_asm.S   plcom
-
-# Integrator real-time clock
-device plrtc
-attach plrtc at ifpga
-file   arch/evbarm/ifpga/pl030_rtc.c   plrtc
-
 # ISA support.
-file   arch/evbarm/iq80310/isa_machdep.c       isa & iq80310
 file   arch/arm32/isa/isa_io.c                 isa
 file   arch/arm32/isa/isa_io_asm.S             isa
 
@@ -136,8 +90,6 @@
 #
 # Include PCI config
 #
-file   arch/evbarm/iq80310/pci_machdep.c       pci & iq80310
-file   arch/evbarm/integrator/pci_machdep.c    pci & integrator
 
 include "dev/mii/files.mii"                    # network devices MII bus
 include "dev/i2o/files.i2o"                    # I2O drivers.
diff -r 2639b631ac80 -r 97b115ea7a3b sys/arch/evbarm/conf/files.integrator
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/files.integrator     Sun Nov 04 02:20:22 2001 +0000
@@ -0,0 +1,36 @@
+#      $NetBSD: files.integrator,v 1.1 2001/11/04 02:20:22 thorpej Exp $
+#
+# ARM, Ltd. Integrator evaluation board configuraiton info
+#
+
+file   arch/evbarm/integrator/integrator_machdep.c     integrator
+file   arch/evbarm/integrator/int_bus_dma.c            integrator
+
+# Integrator fpga specific files
+device ifpga {[offset = -1], [irq = -1]}: pcibus
+attach ifpga at mainbus
+file   arch/evbarm/ifpga/ifpga.c               ifpga
+file   arch/evbarm/ifpga/ifpga_io.c            ifpga
+file   arch/evbarm/ifpga/ifpga_io_asm.S        ifpga
+file   arch/evbarm/ifpga/ifpga_clock.c         ifpga
+file   arch/evbarm/ifpga/ifpga_irq.S           ifpga
+file   arch/evbarm/ifpga/ifpga_irqhandler.c    ifpga
+file   arch/evbarm/ifpga/ifpga_pci.c           ifpga & pci
+
+# Integrator fpga serial port
+defopt opt_plcom.h     PLCOM_DEBUG PLCOM_MPLOCK
+device plcom { } : tty
+file   arch/evbarm/dev/plcom.c                 plcom needs-flag
+
+attach plcom at ifpga with plcom_ifpga
+file   arch/evbarm/ifpga/plcom_ifpga.c         plcom_ifpga
+#file  arch/evbarm/ifpga/pl010_uart_io.c       plcom
+#file  arch/evbarm/ifpga/pl010_uart_io_asm.S   plcom
+
+# Integrator real-time clock
+device plrtc
+attach plrtc at ifpga
+file   arch/evbarm/ifpga/pl030_rtc.c           plrtc
+
+# Integrator PCI support
+file   arch/evbarm/integrator/pci_machdep.c    pci & integrator
diff -r 2639b631ac80 -r 97b115ea7a3b sys/arch/evbarm/conf/files.iq80310
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/files.iq80310        Sun Nov 04 02:20:22 2001 +0000
@@ -0,0 +1,9 @@
+#      $NetBSD: files.iq80310,v 1.1 2001/11/04 02:20:22 thorpej Exp $
+#
+# Intel IQ80310 evaluation board configuration info
+#
+
+file   arch/evbarm/iq80310/iq80310_machdep.c           iq80310
+
+# IQ80310 PCI support
+file   arch/evbarm/iq80310/pci_machdep.c               pci & iq80310
diff -r 2639b631ac80 -r 97b115ea7a3b sys/arch/evbarm/conf/std.integrator
--- a/sys/arch/evbarm/conf/std.integrator       Sun Nov 04 01:36:18 2001 +0000
+++ b/sys/arch/evbarm/conf/std.integrator       Sun Nov 04 02:20:22 2001 +0000
@@ -1,9 +1,12 @@
-#      $NetBSD: std.integrator,v 1.1 2001/10/27 16:14:44 rearnsha Exp $
+#      $NetBSD: std.integrator,v 1.2 2001/11/04 02:20:22 thorpej Exp $
 #
 # standard NetBSD/netwinder options
 
 machine        evbarm arm
 
+# Pull in Integrator config definitions.
+include "arch/evbarm/conf/files.integrator"
+
 options        EXEC_AOUT
 options        EXEC_SCRIPT
 options                EXEC_ELF32
diff -r 2639b631ac80 -r 97b115ea7a3b sys/arch/evbarm/conf/std.iq80310
--- a/sys/arch/evbarm/conf/std.iq80310  Sun Nov 04 01:36:18 2001 +0000
+++ b/sys/arch/evbarm/conf/std.iq80310  Sun Nov 04 02:20:22 2001 +0000
@@ -1,9 +1,12 @@
-#      $NetBSD: std.iq80310,v 1.3 2001/10/27 16:12:33 rearnsha Exp $
+#      $NetBSD: std.iq80310,v 1.4 2001/11/04 02:20:23 thorpej Exp $
 #
 # standard NetBSD/evbarm for IQ80310 options
 
 machine        evbarm arm
 
+# Pull in IQ80310 config definitions.
+include "arch/evbarm/conf/files.iq80310"
+
 options                EXEC_ELF32
 options        EXEC_AOUT
 options        EXEC_SCRIPT