From owner-svn-src-head@FreeBSD.ORG Fri Jan 16 02:34:34 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 749D3C9; Fri, 16 Jan 2015 02:34:34 +0000 (UTC) Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50]) (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 58DCF69A; Fri, 16 Jan 2015 02:34:34 +0000 (UTC) Received: from aurora.physics.berkeley.edu (aurora.Physics.Berkeley.EDU [128.32.117.67]) (authenticated bits=0) by d.mail.sonic.net (8.14.9/8.14.9) with ESMTP id t0G2YVXY003248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 15 Jan 2015 18:34:31 -0800 Message-ID: <54B878B7.7050206@freebsd.org> Date: Thu, 15 Jan 2015 18:34:31 -0800 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Navdeep Parhar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r277227 - in head/sys: amd64/conf arm/conf conf modules powerpc/conf References: <201501160139.t0G1dPu5029070@svn.freebsd.org> In-Reply-To: <201501160139.t0G1dPu5029070@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Sonic-CAuth: UmFuZG9tSVb4LW+amc3woOTEX1tdwvOMlK9saSF+7h6eDZWT+AlQuQE1eyzu4KNmPs0Jq0aKPBYeqjQm+ToY4ZjaXNBNp/JkuKc0OO9Fkw0= X-Sonic-ID: C;FKtmMyid5BGx4dmh1eMT4g== M;dKuXMyid5BGx4dmh1eMT4g== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd 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 02:34:34 -0000 On 01/15/15 17:39, Navdeep Parhar wrote: > 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/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 Don't you want MACHINE_ARCH != powerpc here rather than MACHINE_CPUARCH if it builds on powerpc64? -Nathan > > 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 >