svn commit: r277227 - in head/sys: amd64/conf arm/conf conf modules powerpc/conf

[Nathan Whitehorn]

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
>