diff options
| author | np <np@FreeBSD.org> | 2014-12-31 20:34:12 +0000 |
|---|---|---|
| committer | np <np@FreeBSD.org> | 2014-12-31 20:34:12 +0000 |
| commit | 6c2366689f42cf2ef36537c4208b6064e161b407 (patch) | |
| tree | 4eb49a9330680f1e1bd7b2ec92c97b5af8e96594 /sys | |
| parent | a0de2e3885a864239b3f66288ac5340ac72a6c9e (diff) | |
| download | FreeBSD-src-6c2366689f42cf2ef36537c4208b6064e161b407.zip FreeBSD-src-6c2366689f42cf2ef36537c4208b6064e161b407.tar.gz | |
Temporarily unplug cxgbe(4) from !amd64 builds.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/modules/Makefile | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 9b697f0..a762d25 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -300,6 +300,7 @@ options DRM_DEBUG # Include debug printfs (slow) # 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 printfs (slow) # 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 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 66c1dbc..8199591 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0b1252d..5b9b687 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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" |
