From owner-svn-src-head@FreeBSD.ORG Fri Jan 16 01:39:27 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01E35684; Fri, 16 Jan 2015 01:39:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E138EEDE; Fri, 16 Jan 2015 01:39:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0G1dQqd029078; Fri, 16 Jan 2015 01:39:26 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0G1dPu5029070; Fri, 16 Jan 2015 01:39:25 GMT (envelope-from np@FreeBSD.org) Message-Id: <201501160139.t0G1dPu5029070@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 16 Jan 2015 01:39:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277227 - in head/sys: amd64/conf arm/conf conf modules powerpc/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2015 01:39:27 -0000 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