Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 Jun 2017 20:21:53 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r320296 - head/usr.bin/dtc
Message-ID:  <201706232021.v5NKLrYm008596@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Fri Jun 23 20:21:53 2017
New Revision: 320296
URL: https://svnweb.freebsd.org/changeset/base/320296

Log:
  dtc: Update to upstream 9ce35ff8
  
   - Add "compatible with gpl dtc X.Y.Z" to version output so U-Boot doesn't complain
   - Fix cross reference node
  
  This fixes some Allwinner DTS (and probably others).

Modified:
  head/usr.bin/dtc/dtc.cc
  head/usr.bin/dtc/fdt.cc

Modified: head/usr.bin/dtc/dtc.cc
==============================================================================
--- head/usr.bin/dtc/dtc.cc	Fri Jun 23 20:07:56 2017	(r320295)
+++ head/usr.bin/dtc/dtc.cc	Fri Jun 23 20:21:53 2017	(r320296)
@@ -51,14 +51,17 @@ using std::string;
  * The current major version of the tool.
  */
 int version_major = 0;
+int version_major_compatible = 1;
 /**
  * The current minor version of the tool.
  */
 int version_minor = 5;
+int version_minor_compatible = 4;
 /**
  * The current patch level of the tool.
  */
 int version_patch = 0;
+int version_patch_compatible = 0;
 
 static void usage(const string &argv0)
 {
@@ -77,8 +80,10 @@ static void usage(const string &argv0)
  */
 static void version(const char* progname)
 {
-	fprintf(stderr, "Version: %s %d.%d.%d\n", progname, version_major,
-			version_minor, version_patch);
+	fprintf(stdout, "Version: %s %d.%d.%d compatible with gpl dtc %d.%d.%d\n", progname,
+		version_major, version_minor, version_patch,
+		version_major_compatible, version_minor_compatible,
+		version_patch_compatible);
 }
 
 using fdt::device_tree;

Modified: head/usr.bin/dtc/fdt.cc
==============================================================================
--- head/usr.bin/dtc/fdt.cc	Fri Jun 23 20:07:56 2017	(r320295)
+++ head/usr.bin/dtc/fdt.cc	Fri Jun 23 20:21:53 2017	(r320296)
@@ -1224,9 +1224,9 @@ device_tree::resolve_cross_references()
 				{
 					pv->byte_data.push_back('@');
 					push_string(pv->byte_data, p->second);
-					pv->byte_data.push_back(0);
 				}
 			}
+			pv->byte_data.push_back(0);
 		}
 	}
 	std::unordered_map<property_value*, fixup&> phandle_set;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706232021.v5NKLrYm008596>