Author: np
Date: Fri Jan 16 01:39:24 2015
New Revision: 277227
URL: https://svnweb.freebsd.org/changeset/base/277227
Log:
Plug cxgbe(4) back into !powerpc && !arm builds, instead of building it
on amd64 only.
Modified:
head/sys/amd64/conf/NOTES
head/sys/arm/conf/NOTES
head/sys/conf/NOTES
head/sys/modules/Makefile
head/sys/powerpc/conf/NOTES
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES Fri Jan 16 01:32:40 2015 (r277226)
+++ head/sys/amd64/conf/NOTES Fri Jan 16 01:39:24 2015 (r277227)
@@ -300,7 +300,6 @@ 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)
@@ -323,7 +322,6 @@ 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/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES Fri Jan 16 01:32:40 2015 (r277226)
+++ head/sys/arm/conf/NOTES Fri Jan 16 01:39:24 2015 (r277227)
@@ -82,6 +82,7 @@ nodevice snake_saver
nodevice star_saver
nodevice warp_saver
+nodevice cxgbe
nodevice pcii
nodevice snd_cmi
nodevice tnt4882
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Fri Jan 16 01:32:40 2015 (r277226)
+++ head/sys/conf/NOTES Fri Jan 16 01:39:24 2015 (r277227)
@@ -1917,6 +1917,8 @@ 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.
+# cxgb: Chelsio T3 based 1GbE/10GbE PCIe Ethernet adapters.
+# cxgbe:Chelsio T4 and T5 based 1GbE/10GbE/40GbE PCIe Ethernet adapters.
# 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
@@ -2065,6 +2067,7 @@ device bge # Broadcom BCM570xx
Gigabit
device cas # Sun Cassini/Cassini+ and NS DP83065 Saturn
device cxgb # Chelsio T3 10 Gigabit Ethernet
device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware
+device cxgbe # Chelsio T4 and T5 1GbE/10GbE/40GbE
device dc # DEC/Intel 21143 and various workalikes
device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Fri Jan 16 01:32:40 2015 (r277226)
+++ head/sys/modules/Makefile Fri Jan 16 01:39:24 2015 (r277227)
@@ -443,7 +443,8 @@ _ti= ti
_txp= txp
.endif
-.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} == "amd64"
+.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
+ ${MACHINE_CPUARCH} != "powerpc"
_cxgbe= cxgbe
.endif
Modified: head/sys/powerpc/conf/NOTES
==============================================================================
--- head/sys/powerpc/conf/NOTES Fri Jan 16 01:32:40 2015 (r277226)
+++ head/sys/powerpc/conf/NOTES Fri Jan 16 01:39:24 2015 (r277227)
@@ -57,6 +57,7 @@ device adm1030 # Apple G4 MDD fan cont
# Devices we don't want to deal with
nodevice bktr
+nodevice cxgbe # XXX: builds on powerpc64 only.
nodevice fdc
nodevice ppc
nodevice splash
_______________________________________________
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"
