Author: np
Date: Wed Dec 31 20:34:12 2014
New Revision: 276480
URL: https://svnweb.freebsd.org/changeset/base/276480
Log:
Temporarily unplug cxgbe(4) from !amd64 builds.
Modified:
head/sys/amd64/conf/NOTES
head/sys/conf/NOTES
head/sys/modules/Makefile
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES Wed Dec 31 20:31:32 2014 (r276479)
+++ head/sys/amd64/conf/NOTES Wed Dec 31 20:34:12 2014 (r276480)
@@ -300,6 +300,7 @@ options DRM_DEBUG # Include debug print
# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
# adapters.
+# cxgbe: Chelsio T4/T5 1GbE/10GbE/40GbE PCIe Ethernet adapters
# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
# HP PC Lan+, various PC Card devices
# (requires miibus)
@@ -322,6 +323,7 @@ options DRM_DEBUG # Include debug print
# Requires the wpi firmware module
device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
+device cxgbe # Chelsio T4/T5 1GbE/10GbE/40GbE
device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
options ED_3C503
options ED_HPP
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Wed Dec 31 20:31:32 2014 (r276479)
+++ head/sys/conf/NOTES Wed Dec 31 20:34:12 2014 (r276480)
@@ -1918,8 +1918,6 @@ device xmphy # XaQti XMAC II
# cas: Sun Cassini/Cassini+ and National Semiconductor DP83065 Saturn
# cm: Arcnet SMC COM90c26 / SMC COM90c56
# (and SMC COM90c66 in '56 compatibility mode) adapters.
-# cxgbe: Support for PCI express 10Gb/1Gb adapters based on the Chelsio T4
-# (Terminator 4) ASIC.
# dc: Support for PCI fast ethernet adapters based on the DEC/Intel 21143
# and various workalikes including:
# the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
@@ -2096,7 +2094,6 @@ device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# PCI Ethernet NICs.
-device cxgbe # Chelsio T4 10GbE PCIe adapter
device de # DEC/Intel DC21x4x (``Tulip'')
device em # Intel Pro/1000 Gigabit Ethernet
device igb # Intel Pro/1000 PCIE Gigabit Ethernet
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Wed Dec 31 20:31:32 2014 (r276479)
+++ head/sys/modules/Makefile Wed Dec 31 20:34:12 2014 (r276480)
@@ -433,7 +433,6 @@ _pfsync= pfsync
.if ${MK_SOURCELESS_UCODE} != "no"
_bce= bce
-_cxgbe= cxgbe
_fatm= fatm
_fxp= fxp
_ispfw= ispfw
@@ -445,6 +444,9 @@ _ti= ti
_txp= txp
.endif
+.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} == "amd64"
+_cxgbe= cxgbe
+.endif
.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
${MACHINE_CPUARCH} != "powerpc"
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
