summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2010-09-16 09:29:48 +0000
committermarius <marius@FreeBSD.org>2010-09-16 09:29:48 +0000
commit485553ca579c4163a30ab9a6707f9d7ed1e820d3 (patch)
tree1d572ec4d18b333dcd9ee430e578ca7439a2bd58 /sys/modules
parenta59a434889e85d1d59947cb293330c657a32b412 (diff)
downloadFreeBSD-src-485553ca579c4163a30ab9a6707f9d7ed1e820d3.zip
FreeBSD-src-485553ca579c4163a30ab9a6707f9d7ed1e820d3.tar.gz
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.
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/gem/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile
index 94db462..941dc18 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>
OpenPOWER on IntegriCloud