From owner-svn-src-head@FreeBSD.ORG Tue Apr 1 14:24:08 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A46FD6A6; Tue, 1 Apr 2014 14:24:08 +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 91E4EA3B; Tue, 1 Apr 2014 14:24:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31EO8Pw014937; Tue, 1 Apr 2014 14:24:08 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31EO8An014936; Tue, 1 Apr 2014 14:24:08 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201404011424.s31EO8An014936@svn.freebsd.org> From: Warner Losh Date: Tue, 1 Apr 2014 14:24:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263993 - head/share/mk 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.17 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: Tue, 01 Apr 2014 14:24:08 -0000 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".