From 7f2e2855408d5c8af20bb239e18ccd9fc8ac61ea Mon Sep 17 00:00:00 2001 From: kiyohara Date: Mon, 17 Mar 2008 09:30:02 +0000 Subject: [PATCH] Clean up for includes of board independent driver. --- sys/arch/evbarm/conf/files.armadillo9 | 4 +--- sys/arch/evbarm/conf/files.evbarm | 34 +++++++++------------------ sys/arch/evbarm/conf/files.g42xxeb | 5 +--- sys/arch/evbarm/conf/files.gumstix | 6 +---- sys/arch/evbarm/conf/files.ixdp425 | 4 +--- sys/arch/evbarm/conf/files.lubbock | 5 +--- sys/arch/evbarm/conf/files.tsarm | 8 +------ 7 files changed, 17 insertions(+), 49 deletions(-) diff --git a/sys/arch/evbarm/conf/files.armadillo9 b/sys/arch/evbarm/conf/files.armadillo9 index d13ef32bfdb6..ddb976ea7d36 100644 --- a/sys/arch/evbarm/conf/files.armadillo9 +++ b/sys/arch/evbarm/conf/files.armadillo9 @@ -1,4 +1,4 @@ -# $NetBSD: files.armadillo9,v 1.3 2007/12/03 15:33:29 ad Exp $ +# $NetBSD: files.armadillo9,v 1.4 2008/03/17 09:30:02 kiyohara Exp $ # # First try for arm-specific configuration info # @@ -19,5 +19,3 @@ file arch/evbarm/armadillo/armadillo9_iic.c armadillo9iic attach eppcic at epsoc with armadillo9pcic file arch/evbarm/armadillo/armadillo9_pcic.c armadillo9pcic - -include "dev/pcmcia/files.pcmcia" diff --git a/sys/arch/evbarm/conf/files.evbarm b/sys/arch/evbarm/conf/files.evbarm index 47dedb421658..4474d18fc887 100644 --- a/sys/arch/evbarm/conf/files.evbarm +++ b/sys/arch/evbarm/conf/files.evbarm @@ -1,4 +1,4 @@ -# $NetBSD: files.evbarm,v 1.20 2008/02/20 21:43:33 drochner Exp $ +# $NetBSD: files.evbarm,v 1.21 2008/03/17 09:30:02 kiyohara Exp $ # # First try for arm-specific configuration info # @@ -9,20 +9,9 @@ maxusers 2 8 64 # Maintain Interrupt statistics defflag IRQSTATS -# -# 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 @@ -35,20 +24,19 @@ file arch/arm32/fpe-arm/armfpe_glue.S armfpe file arch/arm32/fpe-arm/armfpe_init.c armfpe file arch/arm32/fpe-arm/armfpe.s armfpe -# -# Include ISA config -# +# +# Machine-independent drivers +# +include "dev/ata/files.ata" # ATA devices +include "dev/bluetooth/files.bluetooth" # Bluetooth devices +include "dev/i2o/files.i2o" # I2O devices include "dev/isa/files.isa" # ISA devices - -# -# Include PCI config -# - -include "dev/i2o/files.i2o" # I2O drivers. 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 diff --git a/sys/arch/evbarm/conf/files.g42xxeb b/sys/arch/evbarm/conf/files.g42xxeb index 0eebd5c6a2fe..dfbb01b53244 100644 --- a/sys/arch/evbarm/conf/files.g42xxeb +++ b/sys/arch/evbarm/conf/files.g42xxeb @@ -1,4 +1,4 @@ -# $NetBSD: files.g42xxeb,v 1.4 2007/10/17 19:54:11 garbled Exp $ +# $NetBSD: files.g42xxeb,v 1.5 2008/03/17 09:30:02 kiyohara Exp $ # # Genetec corp. G4255EB evaluation board configuration info # @@ -31,9 +31,6 @@ device opio {[addr=-1], [intr=-1]} 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 diff --git a/sys/arch/evbarm/conf/files.gumstix b/sys/arch/evbarm/conf/files.gumstix index 1188f2e137c7..ca13f966cd09 100644 --- a/sys/arch/evbarm/conf/files.gumstix +++ b/sys/arch/evbarm/conf/files.gumstix @@ -1,4 +1,4 @@ -# $NetBSD: files.gumstix,v 1.9 2007/10/17 19:54:11 garbled Exp $ +# $NetBSD: files.gumstix,v 1.10 2008/03/17 09:30:02 kiyohara Exp $ # # Gumstix. Inc. Gumstix boards configuration info # @@ -8,10 +8,6 @@ file arch/evbarm/gumstix/gumstix_machdep.c # 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 diff --git a/sys/arch/evbarm/conf/files.ixdp425 b/sys/arch/evbarm/conf/files.ixdp425 index 82d61aecc194..5d147cee3032 100644 --- a/sys/arch/evbarm/conf/files.ixdp425 +++ b/sys/arch/evbarm/conf/files.ixdp425 @@ -1,4 +1,4 @@ -# $NetBSD: files.ixdp425,v 1.7 2007/12/03 15:33:31 ad Exp $ +# $NetBSD: files.ixdp425,v 1.8 2008/03/17 09:30:02 kiyohara Exp $ # # Intel IXP425 networkproccesor board configuration info # @@ -33,6 +33,4 @@ file arch/evbarm/ixdp425/ixdp425_led.c ixdpled needs-flag # XXX dev/pcmcia needs fdc #device fdc {drive = -1} -#include "dev/pcmcia/files.pcmcia" - #file arch/evbarm/ixdp425/rbus_machdep.c cardbus diff --git a/sys/arch/evbarm/conf/files.lubbock b/sys/arch/evbarm/conf/files.lubbock index e7bfc8337bde..5d7c6bd4fb83 100644 --- a/sys/arch/evbarm/conf/files.lubbock +++ b/sys/arch/evbarm/conf/files.lubbock @@ -1,4 +1,4 @@ -# $NetBSD: files.lubbock,v 1.6 2005/12/11 12:17:07 christos Exp $ +# $NetBSD: files.lubbock,v 1.7 2008/03/17 09:30:02 kiyohara Exp $ # # Intel LUBBOCK evaluation board configuration info # @@ -33,9 +33,6 @@ file arch/arm/sa11x0/sa1111_kbc.c sackbc 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 diff --git a/sys/arch/evbarm/conf/files.tsarm b/sys/arch/evbarm/conf/files.tsarm index acafb6387614..f499b3ee838d 100644 --- a/sys/arch/evbarm/conf/files.tsarm +++ b/sys/arch/evbarm/conf/files.tsarm @@ -1,4 +1,4 @@ -# $NetBSD: files.tsarm,v 1.10 2007/12/03 15:33:32 ad Exp $ +# $NetBSD: files.tsarm,v 1.11 2008/03/17 09:30:02 kiyohara Exp $ # # First try for arm-specific configuration info # @@ -63,9 +63,3 @@ file dev/isa/i82365_isa.c pcic_isa # 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"