From owner-svn-src-stable-12@freebsd.org  Mon Dec 16 18:00:06 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DB451CA67D;
 Mon, 16 Dec 2019 18:00:06 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47c8F22mPqz46nN;
 Mon, 16 Dec 2019 18:00:06 +0000 (UTC)
 (envelope-from manu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A2C7EC9;
 Mon, 16 Dec 2019 18:00:06 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBGI06tj067693;
 Mon, 16 Dec 2019 18:00:06 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBGI06Sn067692;
 Mon, 16 Dec 2019 18:00:06 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201912161800.xBGI06Sn067692@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Mon, 16 Dec 2019 18:00:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r355809 - stable/12/usr.bin/dtc
X-SVN-Group: stable-12
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: stable/12/usr.bin/dtc
X-SVN-Commit-Revision: 355809
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2019 18:00:06 -0000

Author: manu
Date: Mon Dec 16 18:00:05 2019
New Revision: 355809
URL: https://svnweb.freebsd.org/changeset/base/355809

Log:
  MFC r354115:
  
  dtc: Allow multiple dts-v1 tag
  
  Some dts are including dtsi that also contain a /dts-v1/ tag at the
  top. GNU DTC doesn't seems to have a problem with that so fix our
  dtc to behave the same.
  
  Reviewed by:	kevans

Modified:
  stable/12/usr.bin/dtc/fdt.cc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/dtc/fdt.cc
==============================================================================
--- stable/12/usr.bin/dtc/fdt.cc	Mon Dec 16 17:59:02 2019	(r355808)
+++ stable/12/usr.bin/dtc/fdt.cc	Mon Dec 16 18:00:05 2019	(r355809)
@@ -1563,11 +1563,11 @@ device_tree::parse_file(text_input_buffer &input,
 {
 	input.next_token();
 	// Read the header
-	if (input.consume("/dts-v1/;"))
+	while (input.consume("/dts-v1/;"))
 	{
 		read_header = true;
+		input.next_token();
 	}
-	input.next_token();
 	if (input.consume("/plugin/;"))
 	{
 		is_plugin = true;