From owner-svn-src-head@freebsd.org  Fri Apr 15 15:28:24 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7526AED30D;
 Fri, 15 Apr 2016 15:28:24 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 891E01BFA;
 Fri, 15 Apr 2016 15:28:24 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FFSNpA077412;
 Fri, 15 Apr 2016 15:28:23 GMT (envelope-from sgalabov@FreeBSD.org)
Received: (from sgalabov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FFSNw1077411;
 Fri, 15 Apr 2016 15:28:23 GMT (envelope-from sgalabov@FreeBSD.org)
Message-Id: <201604151528.u3FFSNw1077411@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to
 sgalabov@FreeBSD.org using -f
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Fri, 15 Apr 2016 15:28:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298061 - head/sys/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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2016 15:28:24 -0000

Author: sgalabov
Date: Fri Apr 15 15:28:23 2016
New Revision: 298061
URL: https://svnweb.freebsd.org/changeset/base/298061

Log:
  Change the fdt_static_dtb.S dependency
  
  fdt_static_dtb.S dependency in sys/conf/files is currently set as:
  $S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}
  
  This is wrong, as what fdt_static_dtb.S actually uses is the DTB file
  produced from the FDT_DTS_FILE.
  In addition it also makes using DTS files stored in $S/gnu/dts/${MACHINE}/
  impossible.
  
  So, change the dependency to "fdt_dtb_file", which seems to be the right
  option here anyway.
  
  Approved by:	adrian (mentor)
  Sponsored by:	Smartcom - Bulgaria AD
  Differential Revision:	https://reviews.freebsd.org/D5963

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Apr 15 15:26:31 2016	(r298060)
+++ head/sys/conf/files	Fri Apr 15 15:28:23 2016	(r298061)
@@ -1443,7 +1443,7 @@ dev/fdt/fdt_pinctrl.c		optional fdt fdt_
 dev/fdt/fdt_pinctrl_if.m	optional fdt fdt_pinctrl
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt nand | fdt mx25l
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
-	dependency	"$S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}"
+	dependency	"fdt_dtb_file"
 dev/fdt/simplebus.c		optional fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard