Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move the mii_bitbang attribute into dev/mii/files.mii

Browse Source 
* Pull in dev/mii/files.mii from conf/files, rather than playing
  the magic "files include order" dance in N machine-dependent
  configuration definitions.
This commit is contained in:
thorpej 2002-04-16 20:50:16 +00:00
parent f0edf45953
commit eedd94475c
34 changed files with 40 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/algor/conf/files.algor
View File

@ -1,4 +1,4 @@
# $NetBSD: files.algor,v 1.12 2002/03/13 02:55:10 simonb Exp $
# $NetBSD: files.algor,v 1.13 2002/04/16 20:50:17 thorpej Exp $
# Algorithmics evaluation board specific configuration info.
@ -58,11 +58,6 @@ file arch/algor/algor/cpu.c cpu
device mcclock
file arch/algor/dev/mcclock.c mcclock
#
# Machine-independent MII/PHY drivers.
#
include "dev/mii/files.mii"
#
# Machine-independent I2O drivers.
#

8
sys/arch/alpha/conf/files.alpha
View File

@ -1,4 +1,4 @@
# $NetBSD: files.alpha,v 1.154 2002/03/13 15:18:19 ad Exp $
# $NetBSD: files.alpha,v 1.155 2002/04/16 20:50:17 thorpej Exp $
#
# alpha-specific configuration info
@ -59,12 +59,6 @@ device cpu { } # not really optional
attach cpu at mainbus
file arch/alpha/alpha/cpu.c cpu
#
# Machine-independent MII/PHY drivers.
#
include "dev/mii/files.mii"
#
# Machine-independent I2O drivers.
#

3
sys/arch/amiga/conf/files.amiga
View File

@ -1,4 +1,4 @@
# $NetBSD: files.amiga,v 1.117 2002/01/21 22:13:25 is Exp $
# $NetBSD: files.amiga,v 1.118 2002/04/16 20:50:17 thorpej Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@ -455,7 +455,6 @@ device pccard: pcmciabus, gayle
attach pccard at mainbus
include "dev/pcmcia/files.pcmcia"
include "dev/mii/files.mii"
include "dev/ata/files.ata"
major {wd = 17}

7
sys/arch/arc/conf/files.arc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arc,v 1.37 2002/03/13 02:55:11 simonb Exp $
# $NetBSD: files.arc,v 1.38 2002/04/16 20:50:17 thorpej Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
#
# maxpartitions must be first item in files.${ARCH}
@ -148,11 +148,6 @@ file dev/ic/dp83932.c sn
attach sn at jazzio with sn_jazzio
file arch/arc/jazz/if_sn_jazzio.c sn_jazzio
#
# Machine-independent MII/PHY drivers.
#
include "dev/mii/files.mii"
#
# Machine-independent I2O drivers.
#

3
sys/arch/arm/conf/files.sa11x0
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sa11x0,v 1.2 2001/07/30 10:50:59 rjs Exp $
# $NetBSD: files.sa11x0,v 1.3 2002/04/16 20:50:18 thorpej Exp $
#
# First try for arm-specific configuration info
#
@ -51,5 +51,4 @@ file arch/arm/sa11x0/sa11xx_pcic.c sacpcic | sagpcic
# USB
include "dev/mii/files.mii"
include "dev/usb/files.usb"

3
sys/arch/atari/conf/files.atari
View File

@ -1,5 +1,5 @@
#
# $NetBSD: files.atari,v 1.94 2002/01/07 17:36:40 thorpej Exp $
# $NetBSD: files.atari,v 1.95 2002/04/16 20:50:18 thorpej Exp $
maxpartitions 16
@ -249,7 +249,6 @@ file arch/m68k/m68k/linux_trap.c compat_linux
include "compat/ossaudio/files.ossaudio"
# network devices MII bus
include "dev/mii/files.mii"
# Wscons related includes
include "dev/pckbc/files.pckbc"

5
sys/arch/bebox/conf/files.bebox
View File

@ -1,4 +1,4 @@
# $NetBSD: files.bebox,v 1.32 2002/02/02 18:37:42 jdolecek Exp $
# $NetBSD: files.bebox,v 1.33 2002/04/16 20:50:18 thorpej Exp $
#
# First try for bebox specific configuration info
#
@ -91,9 +91,6 @@ device pcib: isabus
attach pcib at pci
file arch/bebox/pci/pcib.c pcib
# network devices MII bus
include "dev/mii/files.mii"
#
# ISA and mixed ISA+PCI drivers
#

5
sys/arch/cats/conf/files.cats
View File

@ -1,4 +1,4 @@
# $NetBSD: files.cats,v 1.19 2002/02/10 12:26:03 chris Exp $
# $NetBSD: files.cats,v 1.20 2002/04/16 20:50:18 thorpej Exp $
#
# CATS-specific configuration info
#
@ -98,9 +98,6 @@ include "dev/i2o/files.i2o"
#
include "dev/pci/files.pci"
# network devices MII bus
include "dev/mii/files.mii"
device pcib: isabus
attach pcib at pci
file arch/cats/pci/pcib.c pcib

3
sys/arch/cobalt/conf/files.cobalt
View File

@ -1,4 +1,4 @@
# $NetBSD: files.cobalt,v 1.11 2002/03/13 02:55:11 simonb Exp $
# $NetBSD: files.cobalt,v 1.12 2002/04/16 20:50:18 thorpej Exp $
maxpartitions 16
@ -55,7 +55,6 @@ device pcib
attach pcib at pci
file arch/cobalt/pci/pcib.c pcib
include "dev/mii/files.mii"
include "dev/scsipi/files.scsipi"
major {sd = 7}
major {cd = 8}

5
sys/arch/dreamcast/conf/files.dreamcast
View File

@ -1,4 +1,4 @@
# $NetBSD: files.dreamcast,v 1.18 2002/03/27 10:44:38 uch Exp $
# $NetBSD: files.dreamcast,v 1.19 2002/04/16 20:50:19 thorpej Exp $
# maxpartitions must be first item in files.${MACHINE}
maxpartitions 8
@ -57,9 +57,6 @@ include "arch/sh3/conf/files.shb"
file arch/dreamcast/dreamcast/sysasic.c shb
# network devices MII bus
include "dev/mii/files.mii"
device maple { [port = -1], [subunit = -1] }
attach maple at shb
file arch/dreamcast/dev/maple/maple.c maple needs-flag

3
sys/arch/evbarm/conf/files.evbarm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.evbarm,v 1.11 2002/02/19 17:41:15 briggs Exp $
# $NetBSD: files.evbarm,v 1.12 2002/04/16 20:50:19 thorpej Exp $
#
# First try for arm-specific configuration info
#
@ -58,7 +58,6 @@ include "dev/isa/files.isa" # ISA devices
# Include PCI config
#
include "dev/mii/files.mii" # network devices MII bus
include "dev/i2o/files.i2o" # I2O drivers.
include "dev/pci/files.pci" # PCI devices
include "dev/usb/files.usb" # USB device

5
sys/arch/evbmips/conf/files.malta
View File

@ -1,4 +1,4 @@
# $NetBSD: files.malta,v 1.2 2002/03/18 02:33:19 simonb Exp $
# $NetBSD: files.malta,v 1.3 2002/04/16 20:50:19 thorpej Exp $
file arch/evbmips/malta/malta_bus_io.c
file arch/evbmips/malta/malta_bus_mem.c
@ -28,9 +28,6 @@ file arch/evbmips/malta/cpu.c cpu
device mcclock
file arch/evbmips/dev/mcclock.c mcclock
# Machine-independent MII/PHY drivers.
include "dev/mii/files.mii"
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"

6
sys/arch/evbsh3/conf/files.evbsh3
View File

@ -1,4 +1,4 @@
# $NetBSD: files.evbsh3,v 1.13 2002/03/27 10:44:38 uch Exp $
# $NetBSD: files.evbsh3,v 1.14 2002/04/16 20:50:19 thorpej Exp $
#
# new style config file for sh3 architecture
#
@ -55,7 +55,3 @@ attach cpu at mainbus
file arch/sh3/sh3/cpu.c cpu
include "arch/sh3/conf/files.shb"
# network devices MII bus
include "dev/mii/files.mii"

5
sys/arch/hpcarm/conf/files.hpcarm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.hpcarm,v 1.41 2002/04/13 19:15:52 bjh21 Exp $
# $NetBSD: files.hpcarm,v 1.42 2002/04/16 20:50:20 thorpej Exp $
#
# First try for arm-specific configuration info
#
@ -142,8 +142,5 @@ include "dev/i2o/files.i2o"
# Include PCI stuff
include "dev/pci/files.pci"
# network devices MII bus
include "dev/mii/files.mii"
# Include USB stuff
include "dev/usb/files.usb"

5
sys/arch/hpcmips/conf/files.hpcmips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.hpcmips,v 1.80 2002/03/23 09:02:01 hamajima Exp $
# $NetBSD: files.hpcmips,v 1.81 2002/04/16 20:50:20 thorpej Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@ -362,9 +362,6 @@ device fd: disk
file arch/i386/isa/fd.c fdc needs-flag
major {fd = 2}
# network devices MII bus
include "dev/mii/files.mii"
# XXXX pcic here because it needs to be late. The catch: pcic needs
# to be late, so devices which attach to it are attached late. But it
# needs to be before its isa and pci attachments. This answer is

5
sys/arch/hpcsh/conf/files.hpcsh
View File

@ -1,4 +1,4 @@
# $NetBSD: files.hpcsh,v 1.26 2002/03/28 15:26:58 uch Exp $
# $NetBSD: files.hpcsh,v 1.27 2002/04/16 20:50:20 thorpej Exp $
#
maxpartitions 8
@ -117,7 +117,6 @@ file arch/hpcsh/dev/hd64465/hd64465pcmcia.c hd64465pcmcia
file arch/hpcsh/dev/hd6446x/hd6446x_subr.S hd64461if | hd64465if
file arch/hpcsh/dev/hd6446x/hd6446xintc.c hd64461if | hd64465if
include "dev/mii/files.mii"
#include "dev/usb/files.usb"
include "dev/wscons/files.wscons"
@ -125,4 +124,4 @@ include "dev/wscons/files.wscons"
# Machine-independent PCMCIA drivers
#
device fdc {drive = -1} # files.pcmcia requires.
include "dev/pcmcia/files.pcmcia"
include "dev/pcmcia/files.pcmcia"

5
sys/arch/i386/conf/files.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.204 2002/02/02 18:37:43 jdolecek Exp $
# $NetBSD: files.i386,v 1.205 2002/04/16 20:50:20 thorpej Exp $
#
# new style config file for i386 architecture
#
@ -363,9 +363,6 @@ include "compat/pecoff/files.pecoff"
# OSS audio driver compatibility
include "compat/ossaudio/files.ossaudio"
# network devices MII bus
include "dev/mii/files.mii"
#
# CARDBUS
#

3
sys/arch/mac68k/conf/files.mac68k
View File

@ -1,4 +1,4 @@
# $NetBSD: files.mac68k,v 1.103 2002/04/10 04:38:48 briggs Exp $
# $NetBSD: files.mac68k,v 1.104 2002/04/16 20:50:21 thorpej Exp $
# mac68k-specific configuration info
@ -18,7 +18,6 @@ device mainbus { } # no locators (yet?)
attach mainbus at root
include "dev/wscons/files.wscons"
include "dev/mii/files.mii"
define obio_norm { [addr = -1], ["no drq" = -1], ["no hsk" = -1] }
define obio_scsi5380 { [addr = -1], [drq = -1], [hsk = -1] }

5
sys/arch/macppc/conf/files.macppc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.macppc,v 1.48 2002/03/03 07:04:34 nathanw Exp $
# $NetBSD: files.macppc,v 1.49 2002/04/16 20:50:21 thorpej Exp $
#
# macppc-specific configuration info
@ -98,9 +98,6 @@ file arch/macppc/pci/uninorth.c uninorth
# PCI bus support
include "dev/pci/files.pci"
# network devices MII bus
include "dev/mii/files.mii"
include "dev/wscons/files.wscons"
include "dev/wsfont/files.wsfont"
include "dev/rasops/files.rasops"

5
sys/arch/mmeye/conf/files.mmeye
View File

@ -1,4 +1,4 @@
# $NetBSD: files.mmeye,v 1.11 2002/03/27 10:44:39 uch Exp $
# $NetBSD: files.mmeye,v 1.12 2002/04/16 20:50:21 thorpej Exp $
#
# config file for mmeye
@ -57,9 +57,6 @@ device mmeyepcmcia: pcmciabus
attach mmeyepcmcia at mainbus
file arch/mmeye/dev/mmeyepcmcia.c mmeyepcmcia
# network devices MII bus
include "dev/mii/files.mii"
#
# Machine-independent PCMCIA drivers
#

5
sys/arch/mvmeppc/conf/files.mvmeppc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.mvmeppc,v 1.1 2002/02/27 21:02:13 scw Exp $
# $NetBSD: files.mvmeppc,v 1.2 2002/04/16 20:50:21 thorpej Exp $
#
# Motorola's MVMEPPC boards specific configuration info
#
@ -86,9 +86,6 @@ device pcib: isabus
attach pcib at pci
file arch/mvmeppc/pci/pcib.c pcib
# network devices MII bus
include "dev/mii/files.mii"
#
# ISA and mixed ISA+PCI drivers
#

5
sys/arch/netwinder/conf/files.netwinder
View File

@ -1,4 +1,4 @@
# $NetBSD: files.netwinder,v 1.23 2002/04/10 20:30:30 thorpej Exp $
# $NetBSD: files.netwinder,v 1.24 2002/04/16 20:50:21 thorpej Exp $
#
# First try for arm-specific configuration info
#
@ -105,9 +105,6 @@ file arch/netwinder/pci/pci_machdep.c pci
include "dev/pci/files.pci"
# network devices MII bus
include "dev/mii/files.mii"
device pcib: isabus
attach pcib at pci
file arch/netwinder/pci/pcib.c pcib

5
sys/arch/newsmips/conf/files.newsmips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.newsmips,v 1.18 2002/03/13 02:55:13 simonb Exp $
# $NetBSD: files.newsmips,v 1.19 2002/04/16 20:50:22 thorpej Exp $
# NEWSMIPS-specific configuration info
@ -126,9 +126,6 @@ device xafb: wsemuldisplaydev, rasops8
attach xafb at ap
file arch/newsmips/apbus/xafb.c xafb needs-flag
# network devices MII bus
include "dev/mii/files.mii"
#
# Memory Disk for install floppy
#

7
sys/arch/ofppc/conf/files.ofppc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.ofppc,v 1.18 2001/11/28 10:21:18 lukem Exp $
# $NetBSD: files.ofppc,v 1.19 2002/04/16 20:50:22 thorpej Exp $
#
# NetBSD/ofppc configuration info
#
@ -48,11 +48,6 @@ file arch/powerpc/powerpc/linux_trap.c compat_linux
include "dev/ofw/files.ofw"
major {ofdisk = 0}
#
# MII/PHY support
#
include "dev/mii/files.mii"
#
# I2O device support
#

5
sys/arch/playstation2/conf/files.playstation2
View File

@ -1,4 +1,4 @@
# $NetBSD: files.playstation2,v 1.7 2002/03/13 02:55:13 simonb Exp $
# $NetBSD: files.playstation2,v 1.8 2002/04/16 20:50:22 thorpej Exp $
maxpartitions 8
@ -87,9 +87,6 @@ major {md = 6}
include "dev/wscons/files.wscons"
include "dev/wsfont/files.wsfont"
# network devices MII bus
include "dev/mii/files.mii"
include "dev/usb/files.usb"
#

5
sys/arch/prep/conf/files.prep
View File

@ -1,4 +1,4 @@
# $NetBSD: files.prep,v 1.27 2002/02/26 16:09:14 kleink Exp $
# $NetBSD: files.prep,v 1.28 2002/04/16 20:50:22 thorpej Exp $
#
# prep-specific configuration info
#
@ -178,9 +178,6 @@ device paud { }: audio, isadma, ad1848, auconv
attach paud at isa with paud_isa
file arch/prep/isa/paud_isa.c paud_isa
# network devices MII bus
include "dev/mii/files.mii"
# USB drivers
include "dev/usb/files.usb"

5
sys/arch/sandpoint/conf/files.sandpoint
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sandpoint,v 1.10 2001/11/20 12:56:37 lukem Exp $
# $NetBSD: files.sandpoint,v 1.11 2002/04/16 20:50:22 thorpej Exp $
#
# Motorola's "SandPoint" evaluation board's specific configuration info
#
@ -86,9 +86,6 @@ device pcib: isabus
attach pcib at pci
file arch/sandpoint/pci/pcib.c pcib
# network devices MII bus
include "dev/mii/files.mii"
#
# ISA and mixed ISA+PCI drivers
#

4
sys/arch/sbmips/conf/files.sbmips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sbmips,v 1.2 2002/03/06 23:50:42 simonb Exp $
# $NetBSD: files.sbmips,v 1.3 2002/04/16 20:50:23 thorpej Exp $
maxpartitions 8
@ -26,8 +26,6 @@ file arch/mips/cfe/cfe_api.c
###
### MI device inclusion
###
# Machine-independent MII/PHY drivers.
include "dev/mii/files.mii"
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"

3
sys/arch/sgimips/conf/files.sgimips
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sgimips,v 1.19 2002/03/13 02:55:14 simonb Exp $
# $NetBSD: files.sgimips,v 1.20 2002/04/16 20:50:23 thorpej Exp $
maxpartitions 16
@ -96,7 +96,6 @@ include "dev/vme/files.vme"
include "dev/wscons/files.wscons"
include "dev/wsfont/files.wsfont"
include "dev/pckbc/files.pckbc"
include "dev/mii/files.mii"
include "dev/usb/files.usb"
include "dev/scsipi/files.scsipi"
major {sd = 10}

5
sys/arch/sparc/conf/files.sparc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sparc,v 1.110 2002/03/28 19:50:20 uwe Exp $
# $NetBSD: files.sparc,v 1.111 2002/04/16 20:50:23 thorpej Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@ -133,9 +133,6 @@ device tpcic: pcmciabus
attach tpcic at sbus
file arch/sparc/dev/ts102.c tpcic
# network devices MII bus
include "dev/mii/files.mii"
# PCMCIA bus
include "dev/pcmcia/files.pcmcia"
include "dev/ata/files.ata"

5
sys/arch/sparc64/conf/files.sparc64
View File

@ -1,4 +1,4 @@
# $NetBSD: files.sparc64,v 1.59 2002/03/12 04:48:30 uwe Exp $
# $NetBSD: files.sparc64,v 1.60 2002/04/16 20:50:23 thorpej Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@ -55,9 +55,6 @@ device ebus {[addr = -1]}: pcibus
attach ebus at pci
file arch/sparc64/dev/ebus.c ebus
# network devices MII bus
include "dev/mii/files.mii"
device clock: mk48txx
attach clock at mainbus, sbus with clock_sbus
attach clock at ebus with clock_ebus

5
sys/arch/walnut/conf/files.walnut
View File

@ -1,4 +1,4 @@
# $NetBSD: files.walnut,v 1.4 2002/03/14 17:26:27 eeh Exp $
# $NetBSD: files.walnut,v 1.5 2002/04/16 20:50:23 thorpej Exp $
#
# walnut-specific configuration info
@ -26,9 +26,6 @@ major {md = 9}
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"
# Machine-independent MII/PHY drivers.
include "dev/mii/files.mii"
# Machine-independent SCSI drivers
include "dev/scsipi/files.scsipi"
major {sd = 4}

5
sys/arch/x86_64/conf/files.x86_64
View File

@ -1,4 +1,4 @@
# $NetBSD: files.x86_64,v 1.7 2002/01/25 22:01:12 fvdl Exp $
# $NetBSD: files.x86_64,v 1.8 2002/04/16 20:50:24 thorpej Exp $
#
# new style config file for x86_64 architecture
#
@ -191,9 +191,6 @@ file arch/x86_64/x86_64/netbsd32_syscall.c compat_netbsd32
# OSS audio driver compatibility
include "compat/ossaudio/files.ossaudio"
# network devices MII bus
include "dev/mii/files.mii"
include "dev/usb/files.usb"
include "dev/ieee1394/files.ieee1394"

16
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.512 2002/04/16 20:33:00 thorpej Exp $
# $NetBSD: files,v 1.513 2002/04/16 20:50:16 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -194,7 +194,6 @@ define wdc_base
define scsi {[channel = -1]}
define ata {[channel = -1], [drive = -1]}
define atapi {[channel = -1]}
define mii {[phy = -1]}
define irbus { }
define radiodev { }
@ -263,14 +262,6 @@ defparam opt_ipkdb.h IPKDBKEY : IPKDB
file ipkdb/ipkdb_ipkdb.c ipkdb
file ipkdb/ipkdb_if.c ipkdb
# Attribute for devices that read/write an IEEE 802.3u MII bus
# using the bit-bang method.
# XXX Can't be in dev/mii/files.mii because that file hasn't
# XXX been included yet.
#
define mii_bitbang
file dev/mii/mii_bitbang.c mii_bitbang
# Logical disk
#
device ld: disk
@ -284,6 +275,11 @@ file dev/sysmon/sysmon_envsys.c sysmon_envsys needs-flag
file dev/sysmon/sysmon_wdog.c sysmon_wdog needs-flag
file dev/sysmon/sysmon.c sysmon_envsys | sysmon_wdog
#
# MII/PHY support for network devices
#
include "dev/mii/files.mii"
#
# RAIDframe
#