From a69044324497112898a4b05f3ec04db4190e6255 Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 8 Oct 2003 11:07:04 +0000 Subject: [PATCH] Add atabus --- sys/arch/cobalt/conf/GENERIC | 9 ++++++--- sys/arch/evbarm/conf/ADI_BRH | 5 +++-- sys/arch/evbarm/conf/INTEGRATOR | 9 ++++++--- sys/arch/evbarm/conf/IQ31244 | 5 +++-- sys/arch/evbarm/conf/IQ80310 | 5 +++-- sys/arch/evbarm/conf/IQ80321 | 5 +++-- sys/arch/evbarm/conf/LUBBOCK | 3 ++- sys/arch/evbarm/conf/SMDK2800 | 7 +++++-- 8 files changed, 31 insertions(+), 17 deletions(-) diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC index 73876fdd2733..d724ff33a5a1 100644 --- a/sys/arch/cobalt/conf/GENERIC +++ b/sys/arch/cobalt/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.45 2003/09/07 05:49:57 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.46 2003/10/08 11:07:04 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.45 $" +#ident "GENERIC-$Revision: 1.46 $" maxusers 32 @@ -188,6 +188,9 @@ st* at scsibus? target ? lun ? # SCSI tape drives # a machine hang with some controllers. pciide* at pci? dev ? function ? flags 0x0000 +# ATA bus +atabus* at pciide? channel ? + # IDE drives # Flags are used only with controllers that support DMA operations # and mode settings (e.g. some pciide controllers) @@ -199,7 +202,7 @@ pciide* at pci? dev ? function ? flags 0x0000 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -wd* at pciide? channel ? drive ? flags 0x0000 +wd* at atabus? drive ? flags 0x0000 # PCI network interfaces #en* at pci? dev ? function ? # ENI/Adaptec ATM diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH index d8e64bd8f771..b68296a6edff 100644 --- a/sys/arch/evbarm/conf/ADI_BRH +++ b/sys/arch/evbarm/conf/ADI_BRH @@ -1,4 +1,4 @@ -# $NetBSD: ADI_BRH,v 1.9 2003/09/13 13:30:06 chris Exp $ +# $NetBSD: ADI_BRH,v 1.10 2003/10/08 11:07:31 bouyer Exp $ # # ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board # @@ -168,7 +168,8 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +atabus* at pciide? channel ? +wd* at atabus? drive ? flags 0x0000 # PCI SCSI controllers ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR index 7a97e0865d03..3e2ab8d79555 100644 --- a/sys/arch/evbarm/conf/INTEGRATOR +++ b/sys/arch/evbarm/conf/INTEGRATOR @@ -1,4 +1,4 @@ -# $NetBSD: INTEGRATOR,v 1.17 2003/09/13 13:30:06 chris Exp $ +# $NetBSD: INTEGRATOR,v 1.18 2003/10/08 11:07:31 bouyer Exp $ # # GENERIC -- ARM Integrator board Generic kernel # @@ -161,7 +161,10 @@ pci0 at ifpga? # PCI bus # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -#pciide* at pci? dev ? function ? flags 0x0000 +#pciide* at pci? dev ? function ? flags 0x0000 + +# ATA bus support +#atabus* at pciide? channel ? # IDE drives # Flags are used only with controllers that support DMA operations @@ -174,7 +177,7 @@ pci0 at ifpga? # PCI bus # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -#wd* at pciide? channel ? drive ? flags 0x0000 # the drives themselves +#wd* at atabus? drive ? flags 0x0000 # the drives themselves # PCI SCSI Controllers and Buses ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI Controllers diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244 index 56a876ee0ec2..2a53d0894ca2 100644 --- a/sys/arch/evbarm/conf/IQ31244 +++ b/sys/arch/evbarm/conf/IQ31244 @@ -1,4 +1,4 @@ -# $NetBSD: IQ31244,v 1.6 2003/10/06 16:06:06 thorpej Exp $ +# $NetBSD: IQ31244,v 1.7 2003/10/08 11:07:31 bouyer Exp $ # # IQ31244 -- Intel IQ31244 Evaluation Board Kernel # @@ -165,7 +165,8 @@ pci* at ppb? bus ? # Storage devices # pciide* at pci? dev ? function ? # Intel i31244 S-ATA -wd* at pciide? channel ? drive ? flags 0x0000 +atabus* at pciide? channel ? +wd* at atabus? drive ? flags 0x0000 # # Networking devices diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310 index e3af4286f648..4da8ea1b6f62 100644 --- a/sys/arch/evbarm/conf/IQ80310 +++ b/sys/arch/evbarm/conf/IQ80310 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80310,v 1.27 2003/10/06 16:06:06 thorpej Exp $ +# $NetBSD: IQ80310,v 1.28 2003/10/08 11:07:31 bouyer Exp $ # # IQ80310 -- Intel IQ80310 Evaluation Board Kernel # @@ -176,7 +176,8 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +atabus* at pciide? channel ? +wd* at atabus? drive ? flags 0x0000 # PCI SCSI controllers ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321 index b71554c0fb84..160d2ae05d61 100644 --- a/sys/arch/evbarm/conf/IQ80321 +++ b/sys/arch/evbarm/conf/IQ80321 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80321,v 1.22 2003/10/06 16:06:06 thorpej Exp $ +# $NetBSD: IQ80321,v 1.23 2003/10/08 11:07:31 bouyer Exp $ # # IQ80321 -- Intel IQ80321 Evaluation Board Kernel # @@ -169,7 +169,8 @@ pci* at ppb? bus ? # PCI IDE/S-ATA controllers and devices pciide* at pci? dev ? function ? flags 0x0000 -wd* at pciide? channel ? drive ? flags 0x0000 +atabus* at pciide? channel ? +wd* at atabus? drive ? flags 0x0000 # PCI SCSI controllers ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI diff --git a/sys/arch/evbarm/conf/LUBBOCK b/sys/arch/evbarm/conf/LUBBOCK index 34aed105019c..bd4f0c787ce4 100644 --- a/sys/arch/evbarm/conf/LUBBOCK +++ b/sys/arch/evbarm/conf/LUBBOCK @@ -207,7 +207,8 @@ uk* at scsibus? target ? lun ? # SCSI unknown # PCMCIA IDE controllers and disks wdc* at pcmcia? function ? -wd* at wdc? +atabus* at wdc? channel ? +wd* at atabus? drive ? flags 0x0000 # # Networking devices diff --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800 index 4566d75b5098..288b42e9ca14 100644 --- a/sys/arch/evbarm/conf/SMDK2800 +++ b/sys/arch/evbarm/conf/SMDK2800 @@ -1,4 +1,4 @@ -# $NetBSD: SMDK2800,v 1.5 2003/09/13 13:30:07 chris Exp $ +# $NetBSD: SMDK2800,v 1.6 2003/10/08 11:07:31 bouyer Exp $ # # SMDK2800 -- Samsung's S3C2800 evaluation board. # @@ -166,6 +166,9 @@ pci0 at sspci0 # a machine hang with some controllers. #pciide* at pci? dev ? function ? flags 0x0000 +# ATA bus support +#atabus* at pciide? channel ? + # IDE drives # Flags are used only with controllers that support DMA operations # and mode settings (e.g. some pciide controllers) @@ -177,7 +180,7 @@ pci0 at sspci0 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -#wd* at pciide? channel ? drive ? flags 0x0000 # the drives themselves +#wd* at atabus? drive ? flags 0x0000 # the drives themselves # PCI SCSI Controllers and Buses #ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI Controllers