diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2010-09-16 09:29:48 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2010-09-16 09:29:48 +0000 |
| commit | 65f2c0ff587a41a964b6dc809466bb42fc3a5ab8 (patch) | |
| tree | 1d572ec4d18b333dcd9ee430e578ca7439a2bd58 /sys/modules/gem | |
| parent | 6a5ffa0630f04b82c7586ea7ac5d936f00673f65 (diff) | |
| download | src-65f2c0ff587a41a964b6dc809466bb42fc3a5ab8.tar.gz src-65f2c0ff587a41a964b6dc809466bb42fc3a5ab8.zip | |
Merge r207585 from cas(4):
- Don't probe for PHYs if we already know to use a SERDES. Unlike as with
cas(4) this only serves to speed up the the device attach though and can
only be determined via the OFW device tree but not from the VPD.
- Don't touch the MIF when using a SERDES.
- Add some missing bus space barriers, mainly in the PCS code path.
Notes
Notes:
svn path=/head/; revision=212725
Diffstat (limited to 'sys/modules/gem')
| -rw-r--r-- | sys/modules/gem/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile index 94db46251a7f..941dc18f4a29 100644 --- a/sys/modules/gem/Makefile +++ b/sys/modules/gem/Makefile @@ -3,10 +3,15 @@ .PATH: ${.CURDIR}/../../dev/gem KMOD= if_gem -SRCS= bus_if.h device_if.h if_gem.c if_gem_pci.c miibus_if.h pci_if.h +SRCS= bus_if.h device_if.h if_gem.c if_gem_pci.c ${if_gem_sbus} miibus_if.h +SRCS+= ${ofw_bus_if} pci_if.h .if ${MACHINE} == "sparc64" -SRCS+= if_gem_sbus.c ofw_bus_if.h +if_gem_sbus= if_gem_sbus.c +.endif + +.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "sparc64" +ofw_bus_if= ofw_bus_if.h .endif .include <bsd.kmod.mk> |