Date: Tue, 1 Apr 2014 14:24:08 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263993 - head/share/mk Message-ID: <201404011424.s31EO8An014936@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 1 14:24:08 2014 New Revision: 263993 URL: http://svnweb.freebsd.org/changeset/base/263993 Log: Eliminate FDT being treated specially. When the BSDL DTC was introduced, the meaning of WITH_FDT changed from 'do FDT in boot loader and build dtc compiler' to be simply 'do FDT things in the boot loader'. Now that we test for FDT in the architecture specific files, this test here is now redunant and encourages bad behavior, so just eliminate it and make it always yes. Those architectures whose boot loaders don't support FDT already omit it when it is set to yes anyway. Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Apr 1 14:24:03 2014 (r263992) +++ head/share/mk/bsd.own.mk Tue Apr 1 14:24:08 2014 (r263993) @@ -272,6 +272,7 @@ __DEFAULT_YES_OPTIONS = \ DYNAMICROOT \ ED_CRYPTO \ EXAMPLES \ + FDT \ FLOPPY \ FMTREE \ FORMAT_EXTENSIONS \ @@ -381,8 +382,7 @@ __DEFAULT_NO_OPTIONS = \ # this means that we have to test TARGET_ARCH (the buildworld case) as well # as MACHINE_ARCH (the non-buildworld case). Normally TARGET_ARCH is not # used at all in bsd.*.mk, but we have to make an exception here if we want -# to allow defaults for some things like clang and fdt to vary by target -# architecture. +# to allow defaults for some things like clang to vary by target architecture. # .if defined(TARGET_ARCH) __T=${TARGET_ARCH} @@ -427,13 +427,6 @@ __DEFAULT_NO_OPTIONS+=GNUCXX __DEFAULT_YES_OPTIONS+=GNUCXX .endif .endif -# FDT is needed only for arm, mips and powerpc -.if ${__T:Marm*} || ${__T:Mpowerpc*} || ${__T:Mmips*} -__DEFAULT_YES_OPTIONS+=FDT -.else -__DEFAULT_NO_OPTIONS+=FDT -.endif -.undef __T # # MK_* options which default to "yes".
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011424.s31EO8An014936>