diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-10 17:28:49 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-01-10 17:28:49 +0000 |
| commit | 9189261c890fe69464e6d13295275a5ad53c6009 (patch) | |
| tree | 192a7f897bb690b82175b53f3753c07b0c7427fb | |
| parent | 29a234364c594c1a96a73c98170375bf33943f83 (diff) | |
Tweak the way we include the iommu code a bit.
| -rw-r--r-- | sys/arch/sparc64/conf/files.sparc64 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 5404afd8df6..77218c72937 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.115 2009/01/10 17:13:28 kettenis Exp $ +# $OpenBSD: files.sparc64,v 1.116 2009/01/10 17:28:48 kettenis Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -52,7 +52,7 @@ file arch/sparc64/dev/cbus.c cbus # Sun HME Ethernet controllers device hme: ether, ifnet, mii, ifmedia -file dev/ic/hme.c hme +file dev/ic/hme.c hme device uperf file arch/sparc64/dev/uperf.c uperf needs-flag @@ -83,6 +83,11 @@ include "dev/pcmcia/files.pcmcia" # Sun specific files include "../../../dev/sun/files.sun" +define iommu +define viommu +file arch/sparc64/dev/iommu.c iommu | viommu | sbus +file arch/sparc64/dev/viommu.c viommu + attach sbus at mainbus with sbus_mb attach sbus at xbox with sbus_xbox file arch/sparc64/dev/sbus.c sbus @@ -96,19 +101,19 @@ major {wd = 12} include "dev/puc/files.puc" -device psycho: pcibus +device psycho: pcibus, iommu attach psycho at mainbus file arch/sparc64/dev/psycho.c psycho -device schizo: pcibus +device schizo: pcibus, iommu attach schizo at mainbus file arch/sparc64/dev/schizo.c schizo -device pyro: pcibus +device pyro: pcibus, iommu attach pyro at mainbus file arch/sparc64/dev/pyro.c pyro -device vpci: pcibus +device vpci: pcibus, viommu attach vpci at mainbus file arch/sparc64/dev/vpci.c vpci @@ -132,10 +137,6 @@ device sbbc attach sbbc at pci file arch/sparc64/dev/sbbc.c sbbc needs-flag -# IOMMU is for both sbus and pci -file arch/sparc64/dev/iommu.c sbus | psycho | schizo | pyro | vpci -file arch/sparc64/dev/viommu.c vpci - # Starfire PC is needed for sbus and pci file arch/sparc64/dev/starfire.c sbus | psycho |