board independent includes in files.{evbarm,BOARD}

[KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>]

Hi! all,


I don't understand the rules for files.{evbarm,BOARD}.  I found ata,
scsipi, cardbus, and other include files in files.evbarm.  However
pcmcia and bluetooth founds in some files.BOARD.

Shall I move files of include of board independent drivers to
files.evbarm?

Thanks,
--
kiyohara

Index: files.armadillo9
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.armadillo9,v
retrieving revision 1.3
diff -u -r1.3 files.armadillo9
--- files.armadillo9    3 Dec 2007 15:33:29 -0000       1.3
+++ files.armadillo9    27 Jan 2008 11:05:06 -0000
@@ -19,5 +19,3 @@
 
 attach eppcic at epsoc with armadillo9pcic
 file   arch/evbarm/armadillo/armadillo9_pcic.c armadillo9pcic
-
-include        "dev/pcmcia/files.pcmcia"
Index: files.evbarm
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.evbarm,v
retrieving revision 1.19
diff -u -r1.19 files.evbarm
--- files.evbarm        10 Apr 2007 02:31:37 -0000      1.19
+++ files.evbarm        27 Jan 2008 11:05:06 -0000
@@ -15,20 +15,9 @@
 include "dev/wsfont/files.wsfont"
 include "dev/wsfb/files.wsfb"
 
-#
-# Machine-independent ATA drivers
-#
-include "dev/ata/files.ata"
-
 # Memory disk driver
 file   dev/md_root.c                           md & memory_disk_hooks
 
-#
-# Machine-independent SCSI drivers
-#
-
-include "dev/scsipi/files.scsipi"
-
 # Generic MD files
 file   arch/evbarm/evbarm/autoconf.c
 
@@ -41,20 +30,19 @@
 file   arch/arm32/fpe-arm/armfpe_init.c        armfpe
 file   arch/arm32/fpe-arm/armfpe.s             armfpe
 
-#
-# Include ISA config
-#
-
-include "dev/isa/files.isa"                    # ISA devices
 
 #
-# Include PCI config
+# Machine-independent drivers
 #
-
-include "dev/i2o/files.i2o"                    # I2O drivers.
+include "dev/ata/files.ata"                    # ATA devices
+include "dev/bluetooth/files.bluetooth"                # Bluetooth devices
+include "dev/isa/files.isa"                    # ISA devices
+include "dev/i2o/files.i2o"                    # I2O devices
 include "dev/pci/files.pci"                    # PCI devices
-include "dev/usb/files.usb"                    # USB device
-include "dev/cardbus/files.cardbus"            # CARDBus device
+include "dev/cardbus/files.cardbus"            #   and CardBus devices
+include "dev/pcmcia/files.pcmcia"              # PCMCIA devices
+include "dev/scsipi/files.scsipi"              # SCSI devices
+include "dev/usb/files.usb"                    # USB devices
 
 #
 # ARM evaluation board specific devices
Index: files.g42xxeb
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.g42xxeb,v
retrieving revision 1.4
diff -u -r1.4 files.g42xxeb
--- files.g42xxeb       17 Oct 2007 19:54:11 -0000      1.4
+++ files.g42xxeb       27 Jan 2008 11:05:06 -0000
@@ -31,9 +31,6 @@
 attach opio at obio
 file   arch/evbarm/g42xxeb/gb225.c                     opio
 
-# PCMCIA
-include "dev/pcmcia/files.pcmcia"
-
 device opcic: pcmciabus
 attach opcic at opio
 file   arch/arm/sa11x0/sa11xx_pcic.c           opcic
Index: files.gumstix
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.gumstix,v
retrieving revision 1.9
diff -u -r1.9 files.gumstix
--- files.gumstix       17 Oct 2007 19:54:11 -0000      1.9
+++ files.gumstix       27 Jan 2008 11:05:06 -0000
@@ -8,10 +8,6 @@
 # CPU support and integrated peripherals
 include "arch/arm/xscale/files.pxa2x0"
 
-include "dev/bluetooth/files.bluetooth"
-
-include        "dev/pcmcia/files.pcmcia"
-
 #include "dev/sdmmc/files.sdmmc"
 
 # gumstix devices
Index: files.ixdp425
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.ixdp425,v
retrieving revision 1.7
diff -u -r1.7 files.ixdp425
--- files.ixdp425       3 Dec 2007 15:33:31 -0000       1.7
+++ files.ixdp425       27 Jan 2008 11:05:06 -0000
@@ -33,6 +33,4 @@
 # XXX dev/pcmcia needs fdc
 #device fdc {drive = -1}
 
-#include "dev/pcmcia/files.pcmcia"
-
 #file  arch/evbarm/ixdp425/rbus_machdep.c              cardbus
Index: files.lubbock
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.lubbock,v
retrieving revision 1.6
diff -u -r1.6 files.lubbock
--- files.lubbock       11 Dec 2005 12:17:07 -0000      1.6
+++ files.lubbock       27 Jan 2008 11:05:06 -0000
@@ -33,9 +33,6 @@
 
 include "dev/pckbport/files.pckbport"
 
-# PCMCIA
-include "dev/pcmcia/files.pcmcia"
-
 device sacpcic: pcmciabus
 attach sacpcic at sacc
 file   arch/arm/sa11x0/sa11x1_pcic.c   sacpcic needs-flag
Index: files.tsarm
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.tsarm,v
retrieving revision 1.10
diff -u -r1.10 files.tsarm
--- files.tsarm 3 Dec 2007 15:33:32 -0000       1.10
+++ files.tsarm 27 Jan 2008 11:05:06 -0000
@@ -63,9 +63,3 @@
 
 # Code common to ISA and ISAPnP attachments
 file   dev/isa/i82365_isasubr.c        pcic_isa
-
-# this wants to be probed as late as possible.
-#
-# Machine-independent PCMCIA drivers
-#
-include        "dev/pcmcia/files.pcmcia"