diff -Nru device-tree-compiler-1.4.2/checks.c device-tree-compiler-1.4.5/checks.c
--- device-tree-compiler-1.4.2/checks.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/checks.c	2017-09-27 10:00:10.000000000 +0000
@@ -40,7 +40,7 @@
 
 struct check;
 
-typedef void (*check_fn)(struct check *c, struct node *dt, struct node *node);
+typedef void (*check_fn)(struct check *c, struct dt_info *dti, struct node *node);
 
 struct check {
 	const char *name;
@@ -72,17 +72,16 @@
 #define CHECK(_nm, _fn, _d, ...) \
 	CHECK_ENTRY(_nm, _fn, _d, false, false, __VA_ARGS__)
 
-#ifdef __GNUC__
-static inline void check_msg(struct check *c, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
-#endif
-static inline void check_msg(struct check *c, const char *fmt, ...)
+static inline void  PRINTF(3, 4) check_msg(struct check *c, struct dt_info *dti,
+					   const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
 
 	if ((c->warn && (quiet < 1))
 	    || (c->error && (quiet < 2))) {
-		fprintf(stderr, "%s (%s): ",
+		fprintf(stderr, "%s: %s (%s): ",
+			strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
 			(c->error) ? "ERROR" : "Warning", c->name);
 		vfprintf(stderr, fmt, ap);
 		fprintf(stderr, "\n");
@@ -90,27 +89,28 @@
 	va_end(ap);
 }
 
-#define FAIL(c, ...) \
-	do { \
-		TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__); \
-		(c)->status = FAILED; \
-		check_msg((c), __VA_ARGS__); \
+#define FAIL(c, dti, ...)						\
+	do {								\
+		TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__);	\
+		(c)->status = FAILED;					\
+		check_msg((c), dti, __VA_ARGS__);			\
 	} while (0)
 
-static void check_nodes_props(struct check *c, struct node *dt, struct node *node)
+static void check_nodes_props(struct check *c, struct dt_info *dti, struct node *node)
 {
 	struct node *child;
 
 	TRACE(c, "%s", node->fullpath);
 	if (c->fn)
-		c->fn(c, dt, node);
+		c->fn(c, dti, node);
 
 	for_each_child(node, child)
-		check_nodes_props(c, dt, child);
+		check_nodes_props(c, dti, child);
 }
 
-static bool run_check(struct check *c, struct node *dt)
+static bool run_check(struct check *c, struct dt_info *dti)
 {
+	struct node *dt = dti->dt;
 	bool error = false;
 	int i;
 
@@ -123,10 +123,10 @@
 
 	for (i = 0; i < c->num_prereqs; i++) {
 		struct check *prq = c->prereq[i];
-		error = error || run_check(prq, dt);
+		error = error || run_check(prq, dti);
 		if (prq->status != PASSED) {
 			c->status = PREREQ;
-			check_msg(c, "Failed prerequisite '%s'",
+			check_msg(c, dti, "Failed prerequisite '%s'",
 				  c->prereq[i]->name);
 		}
 	}
@@ -134,7 +134,7 @@
 	if (c->status != UNCHECKED)
 		goto out;
 
-	check_nodes_props(c, dt, dt);
+	check_nodes_props(c, dti, dt);
 
 	if (c->status == UNCHECKED)
 		c->status = PASSED;
@@ -153,14 +153,14 @@
  */
 
 /* A check which always fails, for testing purposes only */
-static inline void check_always_fail(struct check *c, struct node *dt,
+static inline void check_always_fail(struct check *c, struct dt_info *dti,
 				     struct node *node)
 {
-	FAIL(c, "always_fail check");
+	FAIL(c, dti, "always_fail check");
 }
 CHECK(always_fail, check_always_fail, NULL);
 
-static void check_is_string(struct check *c, struct node *root,
+static void check_is_string(struct check *c, struct dt_info *dti,
 			    struct node *node)
 {
 	struct property *prop;
@@ -171,7 +171,7 @@
 		return; /* Not present, assumed ok */
 
 	if (!data_is_one_string(prop->val))
-		FAIL(c, "\"%s\" property in %s is not a string",
+		FAIL(c, dti, "\"%s\" property in %s is not a string",
 		     propname, node->fullpath);
 }
 #define WARNING_IF_NOT_STRING(nm, propname) \
@@ -179,7 +179,7 @@
 #define ERROR_IF_NOT_STRING(nm, propname) \
 	ERROR(nm, check_is_string, (propname))
 
-static void check_is_cell(struct check *c, struct node *root,
+static void check_is_cell(struct check *c, struct dt_info *dti,
 			  struct node *node)
 {
 	struct property *prop;
@@ -190,7 +190,7 @@
 		return; /* Not present, assumed ok */
 
 	if (prop->val.len != sizeof(cell_t))
-		FAIL(c, "\"%s\" property in %s is not a single cell",
+		FAIL(c, dti, "\"%s\" property in %s is not a single cell",
 		     propname, node->fullpath);
 }
 #define WARNING_IF_NOT_CELL(nm, propname) \
@@ -202,7 +202,7 @@
  * Structural check functions
  */
 
-static void check_duplicate_node_names(struct check *c, struct node *dt,
+static void check_duplicate_node_names(struct check *c, struct dt_info *dti,
 				       struct node *node)
 {
 	struct node *child, *child2;
@@ -212,12 +212,12 @@
 		     child2;
 		     child2 = child2->next_sibling)
 			if (streq(child->name, child2->name))
-				FAIL(c, "Duplicate node name %s",
+				FAIL(c, dti, "Duplicate node name %s",
 				     child->fullpath);
 }
 ERROR(duplicate_node_names, check_duplicate_node_names, NULL);
 
-static void check_duplicate_property_names(struct check *c, struct node *dt,
+static void check_duplicate_property_names(struct check *c, struct dt_info *dti,
 					   struct node *node)
 {
 	struct property *prop, *prop2;
@@ -227,7 +227,7 @@
 			if (prop2->deleted)
 				continue;
 			if (streq(prop->name, prop2->name))
-				FAIL(c, "Duplicate property name %s in %s",
+				FAIL(c, dti, "Duplicate property name %s in %s",
 				     prop->name, node->fullpath);
 		}
 	}
@@ -238,29 +238,41 @@
 #define UPPERCASE	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #define DIGITS		"0123456789"
 #define PROPNODECHARS	LOWERCASE UPPERCASE DIGITS ",._+*#?-"
+#define PROPNODECHARSSTRICT	LOWERCASE UPPERCASE DIGITS ",-"
 
-static void check_node_name_chars(struct check *c, struct node *dt,
+static void check_node_name_chars(struct check *c, struct dt_info *dti,
 				  struct node *node)
 {
 	int n = strspn(node->name, c->data);
 
 	if (n < strlen(node->name))
-		FAIL(c, "Bad character '%c' in node %s",
+		FAIL(c, dti, "Bad character '%c' in node %s",
 		     node->name[n], node->fullpath);
 }
 ERROR(node_name_chars, check_node_name_chars, PROPNODECHARS "@");
 
-static void check_node_name_format(struct check *c, struct node *dt,
+static void check_node_name_chars_strict(struct check *c, struct dt_info *dti,
+					 struct node *node)
+{
+	int n = strspn(node->name, c->data);
+
+	if (n < node->basenamelen)
+		FAIL(c, dti, "Character '%c' not recommended in node %s",
+		     node->name[n], node->fullpath);
+}
+CHECK(node_name_chars_strict, check_node_name_chars_strict, PROPNODECHARSSTRICT);
+
+static void check_node_name_format(struct check *c, struct dt_info *dti,
 				   struct node *node)
 {
 	if (strchr(get_unitname(node), '@'))
-		FAIL(c, "Node %s has multiple '@' characters in name",
+		FAIL(c, dti, "Node %s has multiple '@' characters in name",
 		     node->fullpath);
 }
 ERROR(node_name_format, check_node_name_format, NULL, &node_name_chars);
 
-static void check_unit_address_vs_reg(struct check *c, struct node *dt,
-			     struct node *node)
+static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti,
+				      struct node *node)
 {
 	const char *unitname = get_unitname(node);
 	struct property *prop = get_property(node, "reg");
@@ -273,17 +285,17 @@
 
 	if (prop) {
 		if (!unitname[0])
-			FAIL(c, "Node %s has a reg or ranges property, but no unit name",
+			FAIL(c, dti, "Node %s has a reg or ranges property, but no unit name",
 			    node->fullpath);
 	} else {
 		if (unitname[0])
-			FAIL(c, "Node %s has a unit name, but no reg property",
+			FAIL(c, dti, "Node %s has a unit name, but no reg property",
 			    node->fullpath);
 	}
 }
 WARNING(unit_address_vs_reg, check_unit_address_vs_reg, NULL);
 
-static void check_property_name_chars(struct check *c, struct node *dt,
+static void check_property_name_chars(struct check *c, struct dt_info *dti,
 				      struct node *node)
 {
 	struct property *prop;
@@ -292,12 +304,44 @@
 		int n = strspn(prop->name, c->data);
 
 		if (n < strlen(prop->name))
-			FAIL(c, "Bad character '%c' in property name \"%s\", node %s",
+			FAIL(c, dti, "Bad character '%c' in property name \"%s\", node %s",
 			     prop->name[n], prop->name, node->fullpath);
 	}
 }
 ERROR(property_name_chars, check_property_name_chars, PROPNODECHARS);
 
+static void check_property_name_chars_strict(struct check *c,
+					     struct dt_info *dti,
+					     struct node *node)
+{
+	struct property *prop;
+
+	for_each_property(node, prop) {
+		const char *name = prop->name;
+		int n = strspn(name, c->data);
+
+		if (n == strlen(prop->name))
+			continue;
+
+		/* Certain names are whitelisted */
+		if (streq(name, "device_type"))
+			continue;
+
+		/*
+		 * # is only allowed at the beginning of property names not counting
+		 * the vendor prefix.
+		 */
+		if (name[n] == '#' && ((n == 0) || (name[n-1] == ','))) {
+			name += n + 1;
+			n = strspn(name, c->data);
+		}
+		if (n < strlen(name))
+			FAIL(c, dti, "Character '%c' not recommended in property name \"%s\", node %s",
+			     name[n], prop->name, node->fullpath);
+	}
+}
+CHECK(property_name_chars_strict, check_property_name_chars_strict, PROPNODECHARSSTRICT);
+
 #define DESCLABEL_FMT	"%s%s%s%s%s"
 #define DESCLABEL_ARGS(node,prop,mark)		\
 	((mark) ? "value of " : ""),		\
@@ -305,10 +349,11 @@
 	((prop) ? (prop)->name : ""), \
 	((prop) ? "' in " : ""), (node)->fullpath
 
-static void check_duplicate_label(struct check *c, struct node *dt,
+static void check_duplicate_label(struct check *c, struct dt_info *dti,
 				  const char *label, struct node *node,
 				  struct property *prop, struct marker *mark)
 {
+	struct node *dt = dti->dt;
 	struct node *othernode = NULL;
 	struct property *otherprop = NULL;
 	struct marker *othermark = NULL;
@@ -325,36 +370,37 @@
 		return;
 
 	if ((othernode != node) || (otherprop != prop) || (othermark != mark))
-		FAIL(c, "Duplicate label '%s' on " DESCLABEL_FMT
+		FAIL(c, dti, "Duplicate label '%s' on " DESCLABEL_FMT
 		     " and " DESCLABEL_FMT,
 		     label, DESCLABEL_ARGS(node, prop, mark),
 		     DESCLABEL_ARGS(othernode, otherprop, othermark));
 }
 
-static void check_duplicate_label_node(struct check *c, struct node *dt,
+static void check_duplicate_label_node(struct check *c, struct dt_info *dti,
 				       struct node *node)
 {
 	struct label *l;
 	struct property *prop;
 
 	for_each_label(node->labels, l)
-		check_duplicate_label(c, dt, l->label, node, NULL, NULL);
+		check_duplicate_label(c, dti, l->label, node, NULL, NULL);
 
 	for_each_property(node, prop) {
 		struct marker *m = prop->val.markers;
 
 		for_each_label(prop->labels, l)
-			check_duplicate_label(c, dt, l->label, node, prop, NULL);
+			check_duplicate_label(c, dti, l->label, node, prop, NULL);
 
 		for_each_marker_of_type(m, LABEL)
-			check_duplicate_label(c, dt, m->ref, node, prop, m);
+			check_duplicate_label(c, dti, m->ref, node, prop, m);
 	}
 }
 ERROR(duplicate_label, check_duplicate_label_node, NULL);
 
-static cell_t check_phandle_prop(struct check *c, struct node *root,
+static cell_t check_phandle_prop(struct check *c, struct dt_info *dti,
 				 struct node *node, const char *propname)
 {
+	struct node *root = dti->dt;
 	struct property *prop;
 	struct marker *m;
 	cell_t phandle;
@@ -364,7 +410,7 @@
 		return 0;
 
 	if (prop->val.len != sizeof(cell_t)) {
-		FAIL(c, "%s has bad length (%d) %s property",
+		FAIL(c, dti, "%s has bad length (%d) %s property",
 		     node->fullpath, prop->val.len, prop->name);
 		return 0;
 	}
@@ -376,7 +422,7 @@
 			/* "Set this node's phandle equal to some
 			 * other node's phandle".  That's nonsensical
 			 * by construction. */ {
-			FAIL(c, "%s in %s is a reference to another node",
+			FAIL(c, dti, "%s in %s is a reference to another node",
 			     prop->name, node->fullpath);
 		}
 		/* But setting this node's phandle equal to its own
@@ -390,7 +436,7 @@
 	phandle = propval_cell(prop);
 
 	if ((phandle == 0) || (phandle == -1)) {
-		FAIL(c, "%s has bad value (0x%x) in %s property",
+		FAIL(c, dti, "%s has bad value (0x%x) in %s property",
 		     node->fullpath, phandle, prop->name);
 		return 0;
 	}
@@ -398,25 +444,26 @@
 	return phandle;
 }
 
-static void check_explicit_phandles(struct check *c, struct node *root,
+static void check_explicit_phandles(struct check *c, struct dt_info *dti,
 				    struct node *node)
 {
+	struct node *root = dti->dt;
 	struct node *other;
 	cell_t phandle, linux_phandle;
 
 	/* Nothing should have assigned phandles yet */
 	assert(!node->phandle);
 
-	phandle = check_phandle_prop(c, root, node, "phandle");
+	phandle = check_phandle_prop(c, dti, node, "phandle");
 
-	linux_phandle = check_phandle_prop(c, root, node, "linux,phandle");
+	linux_phandle = check_phandle_prop(c, dti, node, "linux,phandle");
 
 	if (!phandle && !linux_phandle)
 		/* No valid phandles; nothing further to check */
 		return;
 
 	if (linux_phandle && phandle && (phandle != linux_phandle))
-		FAIL(c, "%s has mismatching 'phandle' and 'linux,phandle'"
+		FAIL(c, dti, "%s has mismatching 'phandle' and 'linux,phandle'"
 		     " properties", node->fullpath);
 
 	if (linux_phandle && !phandle)
@@ -424,7 +471,7 @@
 
 	other = get_node_by_phandle(root, phandle);
 	if (other && (other != node)) {
-		FAIL(c, "%s has duplicated phandle 0x%x (seen before at %s)",
+		FAIL(c, dti, "%s has duplicated phandle 0x%x (seen before at %s)",
 		     node->fullpath, phandle, other->fullpath);
 		return;
 	}
@@ -433,7 +480,7 @@
 }
 ERROR(explicit_phandles, check_explicit_phandles, NULL);
 
-static void check_name_properties(struct check *c, struct node *root,
+static void check_name_properties(struct check *c, struct dt_info *dti,
 				  struct node *node)
 {
 	struct property **pp, *prop = NULL;
@@ -449,7 +496,7 @@
 
 	if ((prop->val.len != node->basenamelen+1)
 	    || (memcmp(prop->val.val, node->name, node->basenamelen) != 0)) {
-		FAIL(c, "\"name\" property in %s is incorrect (\"%s\" instead"
+		FAIL(c, dti, "\"name\" property in %s is incorrect (\"%s\" instead"
 		     " of base node name)", node->fullpath, prop->val.val);
 	} else {
 		/* The name property is correct, and therefore redundant.
@@ -467,9 +514,10 @@
  * Reference fixup functions
  */
 
-static void fixup_phandle_references(struct check *c, struct node *dt,
+static void fixup_phandle_references(struct check *c, struct dt_info *dti,
 				     struct node *node)
 {
+	struct node *dt = dti->dt;
 	struct property *prop;
 
 	for_each_property(node, prop) {
@@ -482,22 +530,27 @@
 
 			refnode = get_node_by_ref(dt, m->ref);
 			if (! refnode) {
-				FAIL(c, "Reference to non-existent node or label \"%s\"\n",
-				     m->ref);
+				if (!(dti->dtsflags & DTSF_PLUGIN))
+					FAIL(c, dti, "Reference to non-existent node or "
+							"label \"%s\"\n", m->ref);
+				else /* mark the entry as unresolved */
+					*((fdt32_t *)(prop->val.val + m->offset)) =
+						cpu_to_fdt32(0xffffffff);
 				continue;
 			}
 
 			phandle = get_node_phandle(dt, refnode);
-			*((cell_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);
+			*((fdt32_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);
 		}
 	}
 }
 ERROR(phandle_references, fixup_phandle_references, NULL,
       &duplicate_node_names, &explicit_phandles);
 
-static void fixup_path_references(struct check *c, struct node *dt,
+static void fixup_path_references(struct check *c, struct dt_info *dti,
 				  struct node *node)
 {
+	struct node *dt = dti->dt;
 	struct property *prop;
 
 	for_each_property(node, prop) {
@@ -510,7 +563,7 @@
 
 			refnode = get_node_by_ref(dt, m->ref);
 			if (!refnode) {
-				FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+				FAIL(c, dti, "Reference to non-existent node or label \"%s\"\n",
 				     m->ref);
 				continue;
 			}
@@ -534,7 +587,7 @@
 WARNING_IF_NOT_STRING(model_is_string, "model");
 WARNING_IF_NOT_STRING(status_is_string, "status");
 
-static void fixup_addr_size_cells(struct check *c, struct node *dt,
+static void fixup_addr_size_cells(struct check *c, struct dt_info *dti,
 				  struct node *node)
 {
 	struct property *prop;
@@ -558,7 +611,7 @@
 #define node_size_cells(n) \
 	(((n)->size_cells == -1) ? 1 : (n)->size_cells)
 
-static void check_reg_format(struct check *c, struct node *dt,
+static void check_reg_format(struct check *c, struct dt_info *dti,
 			     struct node *node)
 {
 	struct property *prop;
@@ -569,25 +622,25 @@
 		return; /* No "reg", that's fine */
 
 	if (!node->parent) {
-		FAIL(c, "Root node has a \"reg\" property");
+		FAIL(c, dti, "Root node has a \"reg\" property");
 		return;
 	}
 
 	if (prop->val.len == 0)
-		FAIL(c, "\"reg\" property in %s is empty", node->fullpath);
+		FAIL(c, dti, "\"reg\" property in %s is empty", node->fullpath);
 
 	addr_cells = node_addr_cells(node->parent);
 	size_cells = node_size_cells(node->parent);
 	entrylen = (addr_cells + size_cells) * sizeof(cell_t);
 
 	if (!entrylen || (prop->val.len % entrylen) != 0)
-		FAIL(c, "\"reg\" property in %s has invalid length (%d bytes) "
+		FAIL(c, dti, "\"reg\" property in %s has invalid length (%d bytes) "
 		     "(#address-cells == %d, #size-cells == %d)",
 		     node->fullpath, prop->val.len, addr_cells, size_cells);
 }
 WARNING(reg_format, check_reg_format, NULL, &addr_size_cells);
 
-static void check_ranges_format(struct check *c, struct node *dt,
+static void check_ranges_format(struct check *c, struct dt_info *dti,
 				struct node *node)
 {
 	struct property *prop;
@@ -598,7 +651,7 @@
 		return;
 
 	if (!node->parent) {
-		FAIL(c, "Root node has a \"ranges\" property");
+		FAIL(c, dti, "Root node has a \"ranges\" property");
 		return;
 	}
 
@@ -610,17 +663,17 @@
 
 	if (prop->val.len == 0) {
 		if (p_addr_cells != c_addr_cells)
-			FAIL(c, "%s has empty \"ranges\" property but its "
+			FAIL(c, dti, "%s has empty \"ranges\" property but its "
 			     "#address-cells (%d) differs from %s (%d)",
 			     node->fullpath, c_addr_cells, node->parent->fullpath,
 			     p_addr_cells);
 		if (p_size_cells != c_size_cells)
-			FAIL(c, "%s has empty \"ranges\" property but its "
+			FAIL(c, dti, "%s has empty \"ranges\" property but its "
 			     "#size-cells (%d) differs from %s (%d)",
 			     node->fullpath, c_size_cells, node->parent->fullpath,
 			     p_size_cells);
 	} else if ((prop->val.len % entrylen) != 0) {
-		FAIL(c, "\"ranges\" property in %s has invalid length (%d bytes) "
+		FAIL(c, dti, "\"ranges\" property in %s has invalid length (%d bytes) "
 		     "(parent #address-cells == %d, child #address-cells == %d, "
 		     "#size-cells == %d)", node->fullpath, prop->val.len,
 		     p_addr_cells, c_addr_cells, c_size_cells);
@@ -628,10 +681,233 @@
 }
 WARNING(ranges_format, check_ranges_format, NULL, &addr_size_cells);
 
+static const struct bus_type pci_bus = {
+	.name = "PCI",
+};
+
+static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+	struct property *prop;
+	cell_t *cells;
+
+	prop = get_property(node, "device_type");
+	if (!prop || !streq(prop->val.val, "pci"))
+		return;
+
+	node->bus = &pci_bus;
+
+	if (!strneq(node->name, "pci", node->basenamelen) &&
+	    !strneq(node->name, "pcie", node->basenamelen))
+		FAIL(c, dti, "Node %s node name is not \"pci\" or \"pcie\"",
+			     node->fullpath);
+
+	prop = get_property(node, "ranges");
+	if (!prop)
+		FAIL(c, dti, "Node %s missing ranges for PCI bridge (or not a bridge)",
+			     node->fullpath);
+
+	if (node_addr_cells(node) != 3)
+		FAIL(c, dti, "Node %s incorrect #address-cells for PCI bridge",
+			     node->fullpath);
+	if (node_size_cells(node) != 2)
+		FAIL(c, dti, "Node %s incorrect #size-cells for PCI bridge",
+			     node->fullpath);
+
+	prop = get_property(node, "bus-range");
+	if (!prop) {
+		FAIL(c, dti, "Node %s missing bus-range for PCI bridge",
+			     node->fullpath);
+		return;
+	}
+	if (prop->val.len != (sizeof(cell_t) * 2)) {
+		FAIL(c, dti, "Node %s bus-range must be 2 cells",
+			     node->fullpath);
+		return;
+	}
+	cells = (cell_t *)prop->val.val;
+	if (fdt32_to_cpu(cells[0]) > fdt32_to_cpu(cells[1]))
+		FAIL(c, dti, "Node %s bus-range 1st cell must be less than or equal to 2nd cell",
+			     node->fullpath);
+	if (fdt32_to_cpu(cells[1]) > 0xff)
+		FAIL(c, dti, "Node %s bus-range maximum bus number must be less than 256",
+			     node->fullpath);
+}
+WARNING(pci_bridge, check_pci_bridge, NULL,
+	&device_type_is_string, &addr_size_cells);
+
+static void check_pci_device_bus_num(struct check *c, struct dt_info *dti, struct node *node)
+{
+	struct property *prop;
+	unsigned int bus_num, min_bus, max_bus;
+	cell_t *cells;
+
+	if (!node->parent || (node->parent->bus != &pci_bus))
+		return;
+
+	prop = get_property(node, "reg");
+	if (!prop)
+		return;
+
+	cells = (cell_t *)prop->val.val;
+	bus_num = (fdt32_to_cpu(cells[0]) & 0x00ff0000) >> 16;
+
+	prop = get_property(node->parent, "bus-range");
+	if (!prop) {
+		min_bus = max_bus = 0;
+	} else {
+		cells = (cell_t *)prop->val.val;
+		min_bus = fdt32_to_cpu(cells[0]);
+		max_bus = fdt32_to_cpu(cells[0]);
+	}
+	if ((bus_num < min_bus) || (bus_num > max_bus))
+		FAIL(c, dti, "Node %s PCI bus number %d out of range, expected (%d - %d)",
+		     node->fullpath, bus_num, min_bus, max_bus);
+}
+WARNING(pci_device_bus_num, check_pci_device_bus_num, NULL, &reg_format, &pci_bridge);
+
+static void check_pci_device_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+	struct property *prop;
+	const char *unitname = get_unitname(node);
+	char unit_addr[5];
+	unsigned int dev, func, reg;
+	cell_t *cells;
+
+	if (!node->parent || (node->parent->bus != &pci_bus))
+		return;
+
+	prop = get_property(node, "reg");
+	if (!prop) {
+		FAIL(c, dti, "Node %s missing PCI reg property", node->fullpath);
+		return;
+	}
+
+	cells = (cell_t *)prop->val.val;
+	if (cells[1] || cells[2])
+		FAIL(c, dti, "Node %s PCI reg config space address cells 2 and 3 must be 0",
+			     node->fullpath);
+
+	reg = fdt32_to_cpu(cells[0]);
+	dev = (reg & 0xf800) >> 11;
+	func = (reg & 0x700) >> 8;
+
+	if (reg & 0xff000000)
+		FAIL(c, dti, "Node %s PCI reg address is not configuration space",
+			     node->fullpath);
+	if (reg & 0x000000ff)
+		FAIL(c, dti, "Node %s PCI reg config space address register number must be 0",
+			     node->fullpath);
+
+	if (func == 0) {
+		snprintf(unit_addr, sizeof(unit_addr), "%x", dev);
+		if (streq(unitname, unit_addr))
+			return;
+	}
+
+	snprintf(unit_addr, sizeof(unit_addr), "%x,%x", dev, func);
+	if (streq(unitname, unit_addr))
+		return;
+
+	FAIL(c, dti, "Node %s PCI unit address format error, expected \"%s\"",
+	     node->fullpath, unit_addr);
+}
+WARNING(pci_device_reg, check_pci_device_reg, NULL, &reg_format, &pci_bridge);
+
+static const struct bus_type simple_bus = {
+	.name = "simple-bus",
+};
+
+static bool node_is_compatible(struct node *node, const char *compat)
+{
+	struct property *prop;
+	const char *str, *end;
+
+	prop = get_property(node, "compatible");
+	if (!prop)
+		return false;
+
+	for (str = prop->val.val, end = str + prop->val.len; str < end;
+	     str += strnlen(str, end - str) + 1) {
+		if (strneq(str, compat, end - str))
+			return true;
+	}
+	return false;
+}
+
+static void check_simple_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+	if (node_is_compatible(node, "simple-bus"))
+		node->bus = &simple_bus;
+}
+WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, &addr_size_cells);
+
+static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+	struct property *prop;
+	const char *unitname = get_unitname(node);
+	char unit_addr[17];
+	unsigned int size;
+	uint64_t reg = 0;
+	cell_t *cells = NULL;
+
+	if (!node->parent || (node->parent->bus != &simple_bus))
+		return;
+
+	prop = get_property(node, "reg");
+	if (prop)
+		cells = (cell_t *)prop->val.val;
+	else {
+		prop = get_property(node, "ranges");
+		if (prop && prop->val.len)
+			/* skip of child address */
+			cells = ((cell_t *)prop->val.val) + node_addr_cells(node);
+	}
+
+	if (!cells) {
+		if (node->parent->parent && !(node->bus == &simple_bus))
+			FAIL(c, dti, "Node %s missing or empty reg/ranges property", node->fullpath);
+		return;
+	}
+
+	size = node_addr_cells(node->parent);
+	while (size--)
+		reg = (reg << 32) | fdt32_to_cpu(*(cells++));
+
+	snprintf(unit_addr, sizeof(unit_addr), "%"PRIx64, reg);
+	if (!streq(unitname, unit_addr))
+		FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"",
+		     node->fullpath, unit_addr);
+}
+WARNING(simple_bus_reg, check_simple_bus_reg, NULL, &reg_format, &simple_bus_bridge);
+
+static void check_unit_address_format(struct check *c, struct dt_info *dti,
+				      struct node *node)
+{
+	const char *unitname = get_unitname(node);
+
+	if (node->parent && node->parent->bus)
+		return;
+
+	if (!unitname[0])
+		return;
+
+	if (!strncmp(unitname, "0x", 2)) {
+		FAIL(c, dti, "Node %s unit name should not have leading \"0x\"",
+		    node->fullpath);
+		/* skip over 0x for next test */
+		unitname += 2;
+	}
+	if (unitname[0] == '0' && isxdigit(unitname[1]))
+		FAIL(c, dti, "Node %s unit name should not have leading 0s",
+		    node->fullpath);
+}
+WARNING(unit_address_format, check_unit_address_format, NULL,
+	&node_name_format, &pci_bridge, &simple_bus_bridge);
+
 /*
  * Style checks
  */
-static void check_avoid_default_addr_size(struct check *c, struct node *dt,
+static void check_avoid_default_addr_size(struct check *c, struct dt_info *dti,
 					  struct node *node)
 {
 	struct property *reg, *ranges;
@@ -646,20 +922,21 @@
 		return;
 
 	if (node->parent->addr_cells == -1)
-		FAIL(c, "Relying on default #address-cells value for %s",
+		FAIL(c, dti, "Relying on default #address-cells value for %s",
 		     node->fullpath);
 
 	if (node->parent->size_cells == -1)
-		FAIL(c, "Relying on default #size-cells value for %s",
+		FAIL(c, dti, "Relying on default #size-cells value for %s",
 		     node->fullpath);
 }
 WARNING(avoid_default_addr_size, check_avoid_default_addr_size, NULL,
 	&addr_size_cells);
 
 static void check_obsolete_chosen_interrupt_controller(struct check *c,
-						       struct node *dt,
+						       struct dt_info *dti,
 						       struct node *node)
 {
+	struct node *dt = dti->dt;
 	struct node *chosen;
 	struct property *prop;
 
@@ -673,12 +950,271 @@
 
 	prop = get_property(chosen, "interrupt-controller");
 	if (prop)
-		FAIL(c, "/chosen has obsolete \"interrupt-controller\" "
+		FAIL(c, dti, "/chosen has obsolete \"interrupt-controller\" "
 		     "property");
 }
 WARNING(obsolete_chosen_interrupt_controller,
 	check_obsolete_chosen_interrupt_controller, NULL);
 
+struct provider {
+	const char *prop_name;
+	const char *cell_name;
+	bool optional;
+};
+
+static void check_property_phandle_args(struct check *c,
+					  struct dt_info *dti,
+				          struct node *node,
+				          struct property *prop,
+				          const struct provider *provider)
+{
+	struct node *root = dti->dt;
+	int cell, cellsize = 0;
+
+	if (prop->val.len % sizeof(cell_t)) {
+		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
+		     prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+		return;
+	}
+
+	for (cell = 0; cell < prop->val.len / sizeof(cell_t); cell += cellsize + 1) {
+		struct node *provider_node;
+		struct property *cellprop;
+		int phandle;
+
+		phandle = propval_cell_n(prop, cell);
+		/*
+		 * Some bindings use a cell value 0 or -1 to skip over optional
+		 * entries when each index position has a specific definition.
+		 */
+		if (phandle == 0 || phandle == -1) {
+			cellsize = 0;
+			continue;
+		}
+
+		/* If we have markers, verify the current cell is a phandle */
+		if (prop->val.markers) {
+			struct marker *m = prop->val.markers;
+			for_each_marker_of_type(m, REF_PHANDLE) {
+				if (m->offset == (cell * sizeof(cell_t)))
+					break;
+			}
+			if (!m)
+				FAIL(c, dti, "Property '%s', cell %d is not a phandle reference in %s",
+				     prop->name, cell, node->fullpath);
+		}
+
+		provider_node = get_node_by_phandle(root, phandle);
+		if (!provider_node) {
+			FAIL(c, dti, "Could not get phandle node for %s:%s(cell %d)",
+			     node->fullpath, prop->name, cell);
+			break;
+		}
+
+		cellprop = get_property(provider_node, provider->cell_name);
+		if (cellprop) {
+			cellsize = propval_cell(cellprop);
+		} else if (provider->optional) {
+			cellsize = 0;
+		} else {
+			FAIL(c, dti, "Missing property '%s' in node %s or bad phandle (referred from %s:%s[%d])",
+			     provider->cell_name,
+			     provider_node->fullpath,
+			     node->fullpath, prop->name, cell);
+			break;
+		}
+
+		if (prop->val.len < ((cell + cellsize + 1) * sizeof(cell_t))) {
+			FAIL(c, dti, "%s property size (%d) too small for cell size %d in %s",
+			     prop->name, prop->val.len, cellsize, node->fullpath);
+		}
+	}
+}
+
+static void check_provider_cells_property(struct check *c,
+					  struct dt_info *dti,
+				          struct node *node)
+{
+	struct provider *provider = c->data;
+	struct property *prop;
+
+	prop = get_property(node, provider->prop_name);
+	if (!prop)
+		return;
+
+	check_property_phandle_args(c, dti, node, prop, provider);
+}
+#define WARNING_PROPERTY_PHANDLE_CELLS(nm, propname, cells_name, ...) \
+	static struct provider nm##_provider = { (propname), (cells_name), __VA_ARGS__ }; \
+	WARNING(nm##_property, check_provider_cells_property, &nm##_provider, &phandle_references);
+
+WARNING_PROPERTY_PHANDLE_CELLS(clocks, "clocks", "#clock-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(cooling_device, "cooling-device", "#cooling-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(dmas, "dmas", "#dma-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(hwlocks, "hwlocks", "#hwlock-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(interrupts_extended, "interrupts-extended", "#interrupt-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(io_channels, "io-channels", "#io-channel-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(iommus, "iommus", "#iommu-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(mboxes, "mboxes", "#mbox-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(msi_parent, "msi-parent", "#msi-cells", true);
+WARNING_PROPERTY_PHANDLE_CELLS(mux_controls, "mux-controls", "#mux-control-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(phys, "phys", "#phy-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(power_domains, "power-domains", "#power-domain-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(pwms, "pwms", "#pwm-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(resets, "resets", "#reset-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(sound_dais, "sound-dais", "#sound-dai-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(thermal_sensors, "thermal-sensors", "#thermal-sensor-cells");
+
+static bool prop_is_gpio(struct property *prop)
+{
+	char *str;
+
+	/*
+	 * *-gpios and *-gpio can appear in property names,
+	 * so skip over any false matches (only one known ATM)
+	 */
+	if (strstr(prop->name, "nr-gpio"))
+		return false;
+
+	str = strrchr(prop->name, '-');
+	if (str)
+		str++;
+	else
+		str = prop->name;
+	if (!(streq(str, "gpios") || streq(str, "gpio")))
+		return false;
+
+	return true;
+}
+
+static void check_gpios_property(struct check *c,
+					  struct dt_info *dti,
+				          struct node *node)
+{
+	struct property *prop;
+
+	/* Skip GPIO hog nodes which have 'gpios' property */
+	if (get_property(node, "gpio-hog"))
+		return;
+
+	for_each_property(node, prop) {
+		struct provider provider;
+
+		if (!prop_is_gpio(prop))
+			continue;
+
+		provider.prop_name = prop->name;
+		provider.cell_name = "#gpio-cells";
+		provider.optional = false;
+		check_property_phandle_args(c, dti, node, prop, &provider);
+	}
+
+}
+WARNING(gpios_property, check_gpios_property, NULL, &phandle_references);
+
+static void check_deprecated_gpio_property(struct check *c,
+					   struct dt_info *dti,
+				           struct node *node)
+{
+	struct property *prop;
+
+	for_each_property(node, prop) {
+		char *str;
+
+		if (!prop_is_gpio(prop))
+			continue;
+
+		str = strstr(prop->name, "gpio");
+		if (!streq(str, "gpio"))
+			continue;
+
+		FAIL(c, dti, "'[*-]gpio' is deprecated, use '[*-]gpios' instead for %s:%s",
+		     node->fullpath, prop->name);
+	}
+
+}
+CHECK(deprecated_gpio_property, check_deprecated_gpio_property, NULL);
+
+static bool node_is_interrupt_provider(struct node *node)
+{
+	struct property *prop;
+
+	prop = get_property(node, "interrupt-controller");
+	if (prop)
+		return true;
+
+	prop = get_property(node, "interrupt-map");
+	if (prop)
+		return true;
+
+	return false;
+}
+static void check_interrupts_property(struct check *c,
+				      struct dt_info *dti,
+				      struct node *node)
+{
+	struct node *root = dti->dt;
+	struct node *irq_node = NULL, *parent = node;
+	struct property *irq_prop, *prop = NULL;
+	int irq_cells, phandle;
+
+	irq_prop = get_property(node, "interrupts");
+	if (!irq_prop)
+		return;
+
+	if (irq_prop->val.len % sizeof(cell_t))
+		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
+		     irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+		     node->fullpath);
+
+	while (parent && !prop) {
+		if (parent != node && node_is_interrupt_provider(parent)) {
+			irq_node = parent;
+			break;
+		}
+
+		prop = get_property(parent, "interrupt-parent");
+		if (prop) {
+			phandle = propval_cell(prop);
+			irq_node = get_node_by_phandle(root, phandle);
+			if (!irq_node) {
+				FAIL(c, dti, "Bad interrupt-parent phandle for %s",
+				     node->fullpath);
+				return;
+			}
+			if (!node_is_interrupt_provider(irq_node))
+				FAIL(c, dti,
+				     "Missing interrupt-controller or interrupt-map property in %s",
+				     irq_node->fullpath);
+
+			break;
+		}
+
+		parent = parent->parent;
+	}
+
+	if (!irq_node) {
+		FAIL(c, dti, "Missing interrupt-parent for %s", node->fullpath);
+		return;
+	}
+
+	prop = get_property(irq_node, "#interrupt-cells");
+	if (!prop) {
+		FAIL(c, dti, "Missing #interrupt-cells in interrupt-parent %s",
+		     irq_node->fullpath);
+		return;
+	}
+
+	irq_cells = propval_cell(prop);
+	if (irq_prop->val.len % (irq_cells * sizeof(cell_t))) {
+		FAIL(c, dti,
+		     "interrupts size is (%d), expected multiple of %d in %s",
+		     irq_prop->val.len, (int)(irq_cells * sizeof(cell_t)),
+		     node->fullpath);
+	}
+}
+WARNING(interrupts_property, check_interrupts_property, &phandle_references);
+
 static struct check *check_table[] = {
 	&duplicate_node_names, &duplicate_property_names,
 	&node_name_chars, &node_name_format, &property_name_chars,
@@ -692,13 +1228,45 @@
 	&address_cells_is_cell, &size_cells_is_cell, &interrupt_cells_is_cell,
 	&device_type_is_string, &model_is_string, &status_is_string,
 
+	&property_name_chars_strict,
+	&node_name_chars_strict,
+
 	&addr_size_cells, &reg_format, &ranges_format,
 
 	&unit_address_vs_reg,
+	&unit_address_format,
+
+	&pci_bridge,
+	&pci_device_reg,
+	&pci_device_bus_num,
+
+	&simple_bus_bridge,
+	&simple_bus_reg,
 
 	&avoid_default_addr_size,
 	&obsolete_chosen_interrupt_controller,
 
+	&clocks_property,
+	&cooling_device_property,
+	&dmas_property,
+	&hwlocks_property,
+	&interrupts_extended_property,
+	&io_channels_property,
+	&iommus_property,
+	&mboxes_property,
+	&msi_parent_property,
+	&mux_controls_property,
+	&phys_property,
+	&power_domains_property,
+	&pwms_property,
+	&resets_property,
+	&sound_dais_property,
+	&thermal_sensors_property,
+
+	&deprecated_gpio_property,
+	&gpios_property,
+	&interrupts_property,
+
 	&always_fail,
 };
 
@@ -763,9 +1331,8 @@
 	die("Unrecognized check name \"%s\"\n", name);
 }
 
-void process_checks(bool force, struct boot_info *bi)
+void process_checks(bool force, struct dt_info *dti)
 {
-	struct node *dt = bi->dt;
 	int i;
 	int error = 0;
 
@@ -773,7 +1340,7 @@
 		struct check *c = check_table[i];
 
 		if (c->warn || c->error)
-			error = error || run_check(c, dt);
+			error = error || run_check(c, dti);
 	}
 
 	if (error) {
diff -Nru device-tree-compiler-1.4.2/convert-dtsv0-lexer.l device-tree-compiler-1.4.5/convert-dtsv0-lexer.l
--- device-tree-compiler-1.4.2/convert-dtsv0-lexer.l	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/convert-dtsv0-lexer.l	2017-09-27 10:00:10.000000000 +0000
@@ -49,7 +49,7 @@
 static unsigned long long last_val;
 static char *last_name; /* = NULL */
 
-const struct {
+static const struct {
 	const char *pattern;
 	int obase, width;
 } guess_table[] = {
diff -Nru device-tree-compiler-1.4.2/data.c device-tree-compiler-1.4.5/data.c
--- device-tree-compiler-1.4.2/data.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/data.c	2017-09-27 10:00:10.000000000 +0000
@@ -171,9 +171,9 @@
 struct data data_append_integer(struct data d, uint64_t value, int bits)
 {
 	uint8_t value_8;
-	uint16_t value_16;
-	uint32_t value_32;
-	uint64_t value_64;
+	fdt16_t value_16;
+	fdt32_t value_32;
+	fdt64_t value_64;
 
 	switch (bits) {
 	case 8:
@@ -197,14 +197,14 @@
 	}
 }
 
-struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
+struct data data_append_re(struct data d, uint64_t address, uint64_t size)
 {
-	struct fdt_reserve_entry bere;
+	struct fdt_reserve_entry re;
 
-	bere.address = cpu_to_fdt64(re->address);
-	bere.size = cpu_to_fdt64(re->size);
+	re.address = cpu_to_fdt64(address);
+	re.size = cpu_to_fdt64(size);
 
-	return data_append_data(d, &bere, sizeof(bere));
+	return data_append_data(d, &re, sizeof(re));
 }
 
 struct data data_append_cell(struct data d, cell_t word)
diff -Nru device-tree-compiler-1.4.2/debian/changelog device-tree-compiler-1.4.5/debian/changelog
--- device-tree-compiler-1.4.2/debian/changelog	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/changelog	2017-11-01 13:26:36.000000000 +0000
@@ -1,8 +1,52 @@
-device-tree-compiler (1.4.2-1~cloud0) xenial-pike; urgency=medium
+device-tree-compiler (1.4.5-3~cloud0) xenial-queens; urgency=medium
 
-  * New upstream release for the Ubuntu Cloud Archive.
+  * New update for the Ubuntu Cloud Archive.
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Wed, 23 Aug 2017 20:57:42 +0000
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Wed, 01 Nov 2017 13:26:36 +0000
+
+device-tree-compiler (1.4.5-3) unstable; urgency=medium
+
+  * Add patch from upstream to fix bugs in testsuite for 32-bit arm. (Closes: #877797)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 06 Oct 2017 11:51:12 -0700
+
+device-tree-compiler (1.4.5-2) unstable; urgency=medium
+
+  * Add patch from upstream to fix building on 32-bit systems.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 28 Sep 2017 18:42:05 -0700
+
+device-tree-compiler (1.4.5-1) unstable; urgency=medium
+
+  * New upstream release
+    (Closes: #877033)
+
+ -- Héctor Orón Martínez <zumbi@debian.org>  Fri, 29 Sep 2017 00:02:44 +0200
+
+device-tree-compiler (1.4.4-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Add DT Overlay support, closes: #863174.
+  * Documentation:
+    - Only install .pdf of documentation paper, dropping .ps and .dvi
+      versions.
+    - Add documentation about dts format and dt objects.
+  * Add debian/watch file.
+  * Switch to source/format: 3.0 (quilt).
+  * Switch to dh and debhelper compat level 10.
+  * debian/rules:
+    - Enabled hardening.
+    - Ensure texlive generated documentation does not embed timestamps,
+      closes: #876657.
+  * debian/control:
+    - Set Priority to optional.
+    - Set Standards-Version to 4.1.0.
+    - Add Vagrant Cascadian to Uploaders.
+    - Use https:// URLs for Vcs-*.
+  * debian/copyright:
+    - Switch to copyright-format 1.0.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 25 Sep 2017 09:10:56 -0700
 
 device-tree-compiler (1.4.2-1) unstable; urgency=medium
 
diff -Nru device-tree-compiler-1.4.2/debian/compat device-tree-compiler-1.4.5/debian/compat
--- device-tree-compiler-1.4.2/debian/compat	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/compat	2017-10-06 17:35:17.000000000 +0000
@@ -1 +1 @@
-5
+10
diff -Nru device-tree-compiler-1.4.2/debian/control device-tree-compiler-1.4.5/debian/control
--- device-tree-compiler-1.4.2/debian/control	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/control	2017-10-06 17:35:17.000000000 +0000
@@ -1,13 +1,13 @@
 Source: device-tree-compiler
 Section: devel
-Priority: extra
+Priority: optional
 Maintainer: Héctor Orón Martínez <zumbi@debian.org>
-Uploaders: Riku Voipio <riku.voipio@linaro.org>
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 5), quilt, flex, bison, texlive, texlive-latex-extra
+Uploaders: Riku Voipio <riku.voipio@linaro.org>, Vagrant Cascadian <vagrant@debian.org>
+Standards-Version: 4.1.0
+Build-Depends: debhelper (>= 10), flex, bison, texlive, texlive-latex-extra
 Homepage: https://git.kernel.org/cgit/utils/dtc/dtc.git
-Vcs-Git: git://anonscm.debian.org/crosstoolchain/device-tree-compiler.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=crosstoolchain/device-tree-compiler.git
+Vcs-Git: https://anonscm.debian.org/git/crosstoolchain/device-tree-compiler.git
+Vcs-Browser: https://anonscm.debian.org/cgit/crosstoolchain/device-tree-compiler.git/
 
 Package: device-tree-compiler
 Architecture: any
diff -Nru device-tree-compiler-1.4.2/debian/copyright device-tree-compiler-1.4.5/debian/copyright
--- device-tree-compiler-1.4.2/debian/copyright	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/copyright	2017-10-06 17:35:17.000000000 +0000
@@ -1,65 +1,84 @@
-This package was debianized by Aurélien GÉRÔME <ag@roxor.cx> on
-Sat,  3 Mar 2007 23:13:14 +0100.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dtc
+Source: https://git.kernel.org/cgit/utils/dtc/dtc.git
+
+Files: *
+Copyright:
+ 2005-2008 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
+ 2007-2008 Jon Loeliger, Freescale Semiconductor, Inc.
+ 2011 The Chromium OS Authors.
+ 2007 Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ 2007 Aurélien GÉRÔME <ag@roxor.cx>
+License: GPL-2+
+
+Files: libfdt/*
+Copyright:
+ 2006-2012 David Gibson, IBM Corporation.
+ 2012 Kim Phillips, Freescale Semiconductor.
+ 2014 David Gibson <david@gibson.dropbear.id.au>
+License: GPL-2+ or BSD-2-clause
+
+Files: tests/*
+Copyright:
+ 2006-2010 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
+ 2011 The Chromium Authors.
+ 2012-2015 NVIDIA CORPORATION.
+ 2013 Google, Inc
+ 2014 David Gibson, <david@gibson.dropbear.id.au>
+ 2016 Free Electrons
+ 2016 Konsulko Inc.
+ 2016 NextThing Co.
+ 2008 Kumar Gala, Freescale Semiconductor, Inc.
+License: LGPL-2.1+
+
+Files: tests/dumptrees.c
+Copyright:
+ David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2006.
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-It was checked out from <git://www.jdl.com/software/dtc.git>.
-
-Upstream Authors:
-
-  David Gibson <david@gibson.dropbear.id.au>
-  Jon Loeliger <jdl@freescale.com>
-
-Copyright notices:
-
-  Copyright 2005-2007 David Gibson, IBM Corporation.
-  Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
-
-Licenses:
-
-  dtc code:
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- *  USA.
- */
-
-  libfdt code:
-
-/*
- * libfdt - Flat Device Tree manipulation
- *
- * libfdt is dual licensed: you can use it either under the terms of
- * the GPL, or the BSD license, at your option.
- *
- *  a) This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of the
- *     License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * Alternatively,
- *
- *  b) Redistribution and use in source and binary forms, with or
+License: BSD-2-clause
+ *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
  *
@@ -84,8 +103,3 @@
  *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-The Debian packaging is (C) 2007, Aurélien GÉRÔME <ag@roxor.cx> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff -Nru device-tree-compiler-1.4.2/debian/device-tree-compiler.docs device-tree-compiler-1.4.5/debian/device-tree-compiler.docs
--- device-tree-compiler-1.4.2/debian/device-tree-compiler.docs	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/device-tree-compiler.docs	2017-10-06 17:35:17.000000000 +0000
@@ -0,0 +1,4 @@
+Documentation/dtc-paper.pdf
+Documentation/dtc-manual.txt
+Documentation/dt-object-internal.txt
+Documentation/dts-format.txt
diff -Nru device-tree-compiler-1.4.2/debian/device-tree-compiler.manpages device-tree-compiler-1.4.5/debian/device-tree-compiler.manpages
--- device-tree-compiler-1.4.2/debian/device-tree-compiler.manpages	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/device-tree-compiler.manpages	2017-10-06 17:35:17.000000000 +0000
@@ -0,0 +1 @@
+debian/manpages/*.1
diff -Nru device-tree-compiler-1.4.2/debian/dirs device-tree-compiler-1.4.5/debian/dirs
--- device-tree-compiler-1.4.2/debian/dirs	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/bin
diff -Nru device-tree-compiler-1.4.2/debian/doc-base.dtc-paper device-tree-compiler-1.4.5/debian/doc-base.dtc-paper
--- device-tree-compiler-1.4.2/debian/doc-base.dtc-paper	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/doc-base.dtc-paper	2017-10-06 17:35:17.000000000 +0000
@@ -7,9 +7,3 @@
 
 Format: PDF
 Files: /usr/share/doc/device-tree-compiler/dtc-paper.pdf.gz
-
-Format: PostScript
-Files: /usr/share/doc/device-tree-compiler/dtc-paper.ps.gz
-
-Format: DVI
-Files: /usr/share/doc/device-tree-compiler/dtc-paper.dvi.gz
diff -Nru device-tree-compiler-1.4.2/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch device-tree-compiler-1.4.5/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch
--- device-tree-compiler-1.4.2/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch	2017-10-06 17:35:17.000000000 +0000
@@ -0,0 +1,41 @@
+From 497432fd2131967f349e69dc5d259072151cc4b4 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding@nvidia.com>
+Date: Wed, 27 Sep 2017 15:04:09 +0200
+Subject: [PATCH 1/3] checks: Use proper format modifier for size_t
+
+The size of size_t can vary between architectures, so using %ld isn't
+going to work on 32-bit builds. Use the %zu modifier to make sure it is
+always correct.
+
+Signed-off-by: Thierry Reding <treding@nvidia.com>
+Acked-by: Rob Herring <robh@kernel.org>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ checks.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/checks.c b/checks.c
+index 902f2e3..08a3a29 100644
+--- a/checks.c
++++ b/checks.c
+@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c,
+ 	int cell, cellsize = 0;
+ 
+ 	if (prop->val.len % sizeof(cell_t)) {
+-		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ 		     prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+ 		return;
+ 	}
+@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c,
+ 		return;
+ 
+ 	if (irq_prop->val.len % sizeof(cell_t))
+-		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ 		     irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+ 		     node->fullpath);
+ 
+-- 
+2.11.0
+
diff -Nru device-tree-compiler-1.4.2/debian/patches/02_remove-unused-check-variable.patch device-tree-compiler-1.4.5/debian/patches/02_remove-unused-check-variable.patch
--- device-tree-compiler-1.4.2/debian/patches/02_remove-unused-check-variable.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/02_remove-unused-check-variable.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-Date: Tue, 28 Jun 2011 12:47:09 +0000 (-0400)
-Subject: dtc: Remove unused check variable
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=0a5aca98ba104ec4101322ccaf36da45064ad3ce
-
-dtc: Remove unused check variable
-
-Commit 376ab6f2 removed the old style check functionality from DTC,
-however the check option and variable were not removed.  This leads to
-build failures when -Werror=unused-but-set-variable is specified:
-
-	dtc.c: In function 'main':
-	dtc.c:102:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable]
-	cc1: all warnings being treated as errors
-	make: *** [dtc.o] Error 1
-	make: *** Waiting for unfinished jobs....
-
-Remove the check variable.
-
-Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/dtc.c b/dtc.c
-index cbc0193..15d2fc2 100644
---- a/dtc.c
-+++ b/dtc.c
-@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
- 	const char *inform = "dts";
- 	const char *outform = "dts";
- 	const char *outname = "-";
--	int force = 0, check = 0, sort = 0;
-+	int force = 0, sort = 0;
- 	const char *arg;
- 	int opt;
- 	FILE *outf = NULL;
-@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
- 	minsize    = 0;
- 	padsize    = 0;
- 
--	while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
-+	while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fqb:vH:s")) != EOF) {
- 		switch (opt) {
- 		case 'I':
- 			inform = optarg;
-@@ -137,9 +137,6 @@ int main(int argc, char *argv[])
- 		case 'f':
- 			force = 1;
- 			break;
--		case 'c':
--			check = 1;
--			break;
- 		case 'q':
- 			quiet++;
- 			break;
diff -Nru device-tree-compiler-1.4.2/debian/patches/03_Remove-unused-variable-in-flat_read_mem_reserve.patch device-tree-compiler-1.4.5/debian/patches/03_Remove-unused-variable-in-flat_read_mem_reserve.patch
--- device-tree-compiler-1.4.2/debian/patches/03_Remove-unused-variable-in-flat_read_mem_reserve.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/03_Remove-unused-variable-in-flat_read_mem_reserve.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-Date: Tue, 28 Jun 2011 13:47:11 +0000 (-0400)
-Subject: dtc: Remove unused variable in flat_read_mem_reserve
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=d5b3165023b1cc3914e9943b91964ec9ad4be8b2
-
-dtc: Remove unused variable in flat_read_mem_reserve
-
-The *p variable is declared and used to save inb->ptr, however p is
-later never used.  This has been the case since commit 6c0f3676 and can
-lead to build failures with -Werror=unused-but-set-variable:
-
-	flattree.c: In function 'flat_read_mem_reserve':
-	flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable]
-	cc1: all warnings being treated as errors
-	make: *** [flattree.o] Error 1
-
-Remove the variable.
-
-Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/flattree.c b/flattree.c
-index ead0332..28d0b23 100644
---- a/flattree.c
-+++ b/flattree.c
-@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
- {
- 	struct reserve_info *reservelist = NULL;
- 	struct reserve_info *new;
--	const char *p;
- 	struct fdt_reserve_entry re;
- 
- 	/*
-@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
- 	 *
- 	 * First pass, count entries.
- 	 */
--	p = inb->ptr;
- 	while (1) {
- 		flat_read_chunk(inb, &re, sizeof(re));
- 		re.address  = fdt64_to_cpu(re.address);
diff -Nru device-tree-compiler-1.4.2/debian/patches/03-tests-Avoid-64-bit-arithmetic-in-assembler.patch device-tree-compiler-1.4.5/debian/patches/03-tests-Avoid-64-bit-arithmetic-in-assembler.patch
--- device-tree-compiler-1.4.2/debian/patches/03-tests-Avoid-64-bit-arithmetic-in-assembler.patch	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/03-tests-Avoid-64-bit-arithmetic-in-assembler.patch	2017-10-06 17:35:54.000000000 +0000
@@ -0,0 +1,138 @@
+From f8872e29ce06d78d3db71b3ab26a7465fc8a9586 Mon Sep 17 00:00:00 2001
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Fri, 6 Oct 2017 23:07:30 +1100
+Subject: [PATCH] tests: Avoid 64-bit arithmetic in assembler
+
+For testing we (ab)use the assembler to build us a sample dtb, independent
+of the other tools (dtc and libfdt) that we're trying to test.  In a few
+places this uses 64-bit arithmetic to decompose 64-bit constants into
+the individual bytes in the blob.
+
+Unfortunately, it seems that some builds of GNU as don't support >32 bit
+arithmetic, though it's not entirely clear to me which do and which don't
+(Fedora i386 does support 64-bit, Debian arm32 doesn't).
+
+Anyway, to be safe, this avoids 64-bit arithmetic in assembler at the cost
+of some extra awkwardness because we have to define the values in 32-bit
+halves.
+
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ tests/testdata.h | 20 +++++++++++++++-----
+ tests/trees.S    | 33 +++++++++++++--------------------
+ 2 files changed, 28 insertions(+), 25 deletions(-)
+
+diff --git a/tests/testdata.h b/tests/testdata.h
+index 3588778..f6bbe1d 100644
+--- a/tests/testdata.h
++++ b/tests/testdata.h
+@@ -4,15 +4,25 @@
+ #define ASM_CONST_LL(x)	(x##ULL)
+ #endif
+ 
+-#define TEST_ADDR_1	ASM_CONST_LL(0xdeadbeef00000000)
+-#define TEST_SIZE_1	ASM_CONST_LL(0x100000)
+-#define TEST_ADDR_2	ASM_CONST_LL(123456789)
+-#define TEST_SIZE_2	ASM_CONST_LL(010000)
++#define TEST_ADDR_1H	ASM_CONST_LL(0xdeadbeef)
++#define TEST_ADDR_1L	ASM_CONST_LL(0x00000000)
++#define TEST_ADDR_1	((TEST_ADDR_1H << 32) | TEST_ADDR_1L)
++#define TEST_SIZE_1H	ASM_CONST_LL(0x00000000)
++#define TEST_SIZE_1L	ASM_CONST_LL(0x00100000)
++#define TEST_SIZE_1	((TEST_SIZE_1H << 32) | TEST_SIZE_1L)
++#define TEST_ADDR_2H	ASM_CONST_LL(0)
++#define TEST_ADDR_2L	ASM_CONST_LL(123456789)
++#define TEST_ADDR_2	((TEST_ADDR_2H << 32) | TEST_ADDR_2L)
++#define TEST_SIZE_2H	ASM_CONST_LL(0)
++#define TEST_SIZE_2L	ASM_CONST_LL(010000)
++#define TEST_SIZE_2	((TEST_SIZE_2H << 32) | TEST_SIZE_2L)
+ 
+ #define TEST_VALUE_1	0xdeadbeef
+ #define TEST_VALUE_2	123456789
+ 
+-#define TEST_VALUE64_1	ASM_CONST_LL(0xdeadbeef01abcdef)
++#define TEST_VALUE64_1H	ASM_CONST_LL(0xdeadbeef)
++#define TEST_VALUE64_1L	ASM_CONST_LL(0x01abcdef)
++#define TEST_VALUE64_1	((TEST_VALUE64_1H << 32) | TEST_VALUE64_1L)
+ 
+ #define PHANDLE_1	0x2000
+ #define PHANDLE_2	0x2001
+diff --git a/tests/trees.S b/tests/trees.S
+index 9854d1d..9859914 100644
+--- a/tests/trees.S
++++ b/tests/trees.S
+@@ -7,16 +7,6 @@
+ 	.byte	((val) >> 8) & 0xff ; \
+ 	.byte	(val) & 0xff	;
+ 
+-#define FDTQUAD(val) \
+-	.byte	((val) >> 56) & 0xff ; \
+-	.byte	((val) >> 48) & 0xff ; \
+-	.byte	((val) >> 40) & 0xff ; \
+-	.byte	((val) >> 32) & 0xff ; \
+-	.byte	((val) >> 24) & 0xff ; \
+-	.byte	((val) >> 16) & 0xff ; \
+-	.byte	((val) >> 8) & 0xff ; \
+-	.byte	(val) & 0xff	;
+-
+ #define TREE_HDR(tree) \
+ 	.balign	8		; \
+ 	.globl	_##tree		; \
+@@ -33,14 +23,16 @@ tree:	\
+ 	FDTLONG(tree##_strings_end - tree##_strings) ; \
+ 	FDTLONG(tree##_struct_end - tree##_struct) ;
+ 
+-#define RSVMAP_ENTRY(addr, len) \
+-	FDTQUAD(addr)		; \
+-	FDTQUAD(len)		; \
++#define RSVMAP_ENTRY(addrh, addrl, lenh, lenl) \
++	FDTLONG(addrh)		; \
++	FDTLONG(addrl)		; \
++	FDTLONG(lenh)		; \
++	FDTLONG(lenl)
+ 
+ #define EMPTY_RSVMAP(tree) \
+ 	.balign	8		; \
+ tree##_rsvmap:			; \
+-	RSVMAP_ENTRY(0, 0) \
++	RSVMAP_ENTRY(0, 0, 0, 0) \
+ tree##_rsvmap_end:		;
+ 
+ #define PROPHDR(tree, name, len) \
+@@ -52,9 +44,10 @@ tree##_rsvmap_end:		;
+ 	PROPHDR(tree, name, 4) \
+ 	FDTLONG(val)		;
+ 
+-#define PROP_INT64(tree, name, val) \
++#define PROP_INT64(tree, name, valh, vall) \
+ 	PROPHDR(tree, name, 8) \
+-	FDTQUAD(val)		;
++	FDTLONG(valh)		; \
++	FDTLONG(vall)		;
+ 
+ #define PROP_STR(tree, name, str) \
+ 	PROPHDR(tree, name, 55f - 54f) \
+@@ -81,16 +74,16 @@ tree##_##name:			; \
+ 
+ 	.balign	8
+ test_tree1_rsvmap:
+-	RSVMAP_ENTRY(TEST_ADDR_1, TEST_SIZE_1)
+-	RSVMAP_ENTRY(TEST_ADDR_2, TEST_SIZE_2)
+-	RSVMAP_ENTRY(0, 0)
++	RSVMAP_ENTRY(TEST_ADDR_1H, TEST_ADDR_1L, TEST_SIZE_1H, TEST_SIZE_1L)
++	RSVMAP_ENTRY(TEST_ADDR_2H, TEST_ADDR_2L, TEST_SIZE_2H, TEST_SIZE_2L)
++	RSVMAP_ENTRY(0, 0, 0, 0)
+ test_tree1_rsvmap_end:
+ 
+ test_tree1_struct:
+ 	BEGIN_NODE("")
+ 	PROP_STR(test_tree1, compatible, "test_tree1")
+ 	PROP_INT(test_tree1, prop_int, TEST_VALUE_1)
+-	PROP_INT64(test_tree1, prop_int64, TEST_VALUE64_1)
++	PROP_INT64(test_tree1, prop_int64, TEST_VALUE64_1H, TEST_VALUE64_1L)
+ 	PROP_STR(test_tree1, prop_str, TEST_STRING_1)
+ 	PROP_INT(test_tree1, address_cells, 1)
+ 	PROP_INT(test_tree1, size_cells, 0)
+-- 
+2.11.0
+
diff -Nru device-tree-compiler-1.4.2/debian/patches/04_Split-out-is_printable_string-into-util.patch device-tree-compiler-1.4.5/debian/patches/04_Split-out-is_printable_string-into-util.patch
--- device-tree-compiler-1.4.2/debian/patches/04_Split-out-is_printable_string-into-util.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/04_Split-out-is_printable_string-into-util.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 5 Jul 2011 19:02:49 +0000 (-0700)
-Subject: Split out is_printable_string() into util.c
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=492f9d5de7db74aeb3a905246c4efd7cb29227a8
-
-Split out is_printable_string() into util.c
-
-This useful function is split out so it will be available to programs
-other than ftdump.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/Makefile.ftdump b/Makefile.ftdump
-index b70905a..2744a18 100644
---- a/Makefile.ftdump
-+++ b/Makefile.ftdump
-@@ -5,7 +5,8 @@
- #
- 
- FTDUMP_SRCS = \
--	ftdump.c
-+	ftdump.c \
-+	util.c
- 
- FTDUMP_GEN_SRCS =
- 
-diff --git a/ftdump.c b/ftdump.c
-index bce6535..db932e3 100644
---- a/ftdump.c
-+++ b/ftdump.c
-@@ -11,36 +11,14 @@
- #include <fdt.h>
- #include <libfdt_env.h>
- 
-+#include "util.h"
-+
- #define FTDUMP_BUF_SIZE	65536
- 
- #define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
- #define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a))))
- #define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
- 
--static int is_printable_string(const void *data, int len)
--{
--	const char *s = data;
--	const char *ss;
--
--	/* zero length is not */
--	if (len == 0)
--		return 0;
--
--	/* must terminate with zero */
--	if (s[len - 1] != '\0')
--		return 0;
--
--	ss = s;
--	while (*s && isprint(*s))
--		s++;
--
--	/* not zero, or not done yet */
--	if (*s != '\0' || (s + 1 - ss) < len)
--		return 0;
--
--	return 1;
--}
--
- static void print_data(const char *data, int len)
- {
- 	int i;
-@@ -50,7 +28,7 @@ static void print_data(const char *data, int len)
- 	if (len == 0)
- 		return;
- 
--	if (is_printable_string(data, len)) {
-+	if (util_is_printable_string(data, len)) {
- 		printf(" = \"%s\"", (const char *)data);
- 	} else if ((len % 4) == 0) {
- 		printf(" = <");
-diff --git a/util.c b/util.c
-index d7ac27d..994436f 100644
---- a/util.c
-+++ b/util.c
-@@ -1,6 +1,9 @@
- /*
-  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
-  *
-+ * util_is_printable_string contributed by
-+ *	Pantelis Antoniou <pantelis.antoniou AT gmail.com>
-+ *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-  * published by the Free Software Foundation; either version 2 of the
-@@ -17,6 +20,7 @@
-  *                                                                   USA
-  */
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -57,3 +61,27 @@ char *join_path(const char *path, const char *name)
- 	memcpy(str+lenp, name, lenn+1);
- 	return str;
- }
-+
-+int util_is_printable_string(const void *data, int len)
-+{
-+	const char *s = data;
-+	const char *ss;
-+
-+	/* zero length is not */
-+	if (len == 0)
-+		return 0;
-+
-+	/* must terminate with zero */
-+	if (s[len - 1] != '\0')
-+		return 0;
-+
-+	ss = s;
-+	while (*s && isprint(*s))
-+		s++;
-+
-+	/* not zero, or not done yet */
-+	if (*s != '\0' || (s + 1 - ss) < len)
-+		return 0;
-+
-+	return 1;
-+}
-diff --git a/util.h b/util.h
-index 9cead84..cc68933 100644
---- a/util.h
-+++ b/util.h
-@@ -1,6 +1,8 @@
- #ifndef _UTIL_H
- #define _UTIL_H
- 
-+#include <stdarg.h>
-+
- /*
-  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
-  *
-@@ -53,4 +55,13 @@ static inline void *xrealloc(void *p, size_t len)
- extern char *xstrdup(const char *s);
- extern char *join_path(const char *path, const char *name);
- 
-+/**
-+ * Check a string of a given length to see if it is all printable and
-+ * has a valid terminator.
-+ *
-+ * @param data	The string to check
-+ * @param len	The string length including terminator
-+ * @return 1 if a valid printable string, 0 if not */
-+int util_is_printable_string(const void *data, int len);
-+
- #endif /* _UTIL_H */
diff -Nru device-tree-compiler-1.4.2/debian/patches/05_Add-missing-tests-to-gitignore.patch device-tree-compiler-1.4.5/debian/patches/05_Add-missing-tests-to-gitignore.patch
--- device-tree-compiler-1.4.2/debian/patches/05_Add-missing-tests-to-gitignore.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/05_Add-missing-tests-to-gitignore.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 5 Jul 2011 19:02:52 +0000 (-0700)
-Subject: Add missing tests to .gitignore
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=ed8fee1a649b5430afc9b551e3bb6746ebe32449
-
-Add missing tests to .gitignore
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/tests/.gitignore b/tests/.gitignore
-index c4e1205..f4e58b2 100644
---- a/tests/.gitignore
-+++ b/tests/.gitignore
-@@ -45,3 +45,5 @@
- /sw_tree1
- /truncated_property
- /value-labels
-+/dtb_reverse
-+/dtbs_equal_unordered
diff -Nru device-tree-compiler-1.4.2/debian/patches/06_Refactor-character-literal-parsing-code.patch device-tree-compiler-1.4.5/debian/patches/06_Refactor-character-literal-parsing-code.patch
--- device-tree-compiler-1.4.2/debian/patches/06_Refactor-character-literal-parsing-code.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/06_Refactor-character-literal-parsing-code.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,249 +0,0 @@
-From: Anton Staaf <robotboy@chromium.org>
-Date: Fri, 9 Sep 2011 19:16:29 +0000 (-0700)
-Subject: dtc: Refactor character literal parsing code
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=b43335a23854b2620140eda6cca2ffae59e8de23
-
-dtc: Refactor character literal parsing code
-
-Move the parsing of hex, octal and escaped characters from data.c
-to util.c where it can be used for character literal parsing within
-strings as well as for stand alone C style character literals.
-
-Signed-off-by: Anton Staaf <robotboy@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/data.c b/data.c
-index fe555e8..b5f3066 100644
---- a/data.c
-+++ b/data.c
-@@ -68,40 +68,6 @@ struct data data_copy_mem(const char *mem, int len)
- 	return d;
- }
- 
--static char get_oct_char(const char *s, int *i)
--{
--	char x[4];
--	char *endx;
--	long val;
--
--	x[3] = '\0';
--	strncpy(x, s + *i, 3);
--
--	val = strtol(x, &endx, 8);
--
--	assert(endx > x);
--
--	(*i) += endx - x;
--	return val;
--}
--
--static char get_hex_char(const char *s, int *i)
--{
--	char x[3];
--	char *endx;
--	long val;
--
--	x[2] = '\0';
--	strncpy(x, s + *i, 2);
--
--	val = strtol(x, &endx, 16);
--	if (!(endx  > x))
--		die("\\x used with no following hex digits\n");
--
--	(*i) += endx - x;
--	return val;
--}
--
- struct data data_copy_escape_string(const char *s, int len)
- {
- 	int i = 0;
-@@ -114,53 +80,10 @@ struct data data_copy_escape_string(const char *s, int len)
- 	while (i < len) {
- 		char c = s[i++];
- 
--		if (c != '\\') {
--			q[d.len++] = c;
--			continue;
--		}
--
--		c = s[i++];
--		assert(c);
--		switch (c) {
--		case 'a':
--			q[d.len++] = '\a';
--			break;
--		case 'b':
--			q[d.len++] = '\b';
--			break;
--		case 't':
--			q[d.len++] = '\t';
--			break;
--		case 'n':
--			q[d.len++] = '\n';
--			break;
--		case 'v':
--			q[d.len++] = '\v';
--			break;
--		case 'f':
--			q[d.len++] = '\f';
--			break;
--		case 'r':
--			q[d.len++] = '\r';
--			break;
--		case '0':
--		case '1':
--		case '2':
--		case '3':
--		case '4':
--		case '5':
--		case '6':
--		case '7':
--			i--; /* need to re-read the first digit as
--			      * part of the octal value */
--			q[d.len++] = get_oct_char(s, &i);
--			break;
--		case 'x':
--			q[d.len++] = get_hex_char(s, &i);
--			break;
--		default:
--			q[d.len++] = c;
--		}
-+		if (c == '\\')
-+			c = get_escape_char(s, &i);
-+
-+		q[d.len++] = c;
- 	}
- 
- 	q[d.len++] = '\0';
-diff --git a/util.c b/util.c
-index 994436f..6d07292 100644
---- a/util.c
-+++ b/util.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
-+#include <assert.h>
- 
- #include "util.h"
- 
-@@ -85,3 +86,101 @@ int util_is_printable_string(const void *data, int len)
- 
- 	return 1;
- }
-+
-+/*
-+ * Parse a octal encoded character starting at index i in string s.  The
-+ * resulting character will be returned and the index i will be updated to
-+ * point at the character directly after the end of the encoding, this may be
-+ * the '\0' terminator of the string.
-+ */
-+static char get_oct_char(const char *s, int *i)
-+{
-+	char x[4];
-+	char *endx;
-+	long val;
-+
-+	x[3] = '\0';
-+	strncpy(x, s + *i, 3);
-+
-+	val = strtol(x, &endx, 8);
-+
-+	assert(endx > x);
-+
-+	(*i) += endx - x;
-+	return val;
-+}
-+
-+/*
-+ * Parse a hexadecimal encoded character starting at index i in string s.  The
-+ * resulting character will be returned and the index i will be updated to
-+ * point at the character directly after the end of the encoding, this may be
-+ * the '\0' terminator of the string.
-+ */
-+static char get_hex_char(const char *s, int *i)
-+{
-+	char x[3];
-+	char *endx;
-+	long val;
-+
-+	x[2] = '\0';
-+	strncpy(x, s + *i, 2);
-+
-+	val = strtol(x, &endx, 16);
-+	if (!(endx  > x))
-+		die("\\x used with no following hex digits\n");
-+
-+	(*i) += endx - x;
-+	return val;
-+}
-+
-+char get_escape_char(const char *s, int *i)
-+{
-+	char	c = s[*i];
-+	int	j = *i + 1;
-+	char	val;
-+
-+	assert(c);
-+	switch (c) {
-+	case 'a':
-+		val = '\a';
-+		break;
-+	case 'b':
-+		val = '\b';
-+		break;
-+	case 't':
-+		val = '\t';
-+		break;
-+	case 'n':
-+		val = '\n';
-+		break;
-+	case 'v':
-+		val = '\v';
-+		break;
-+	case 'f':
-+		val = '\f';
-+		break;
-+	case 'r':
-+		val = '\r';
-+		break;
-+	case '0':
-+	case '1':
-+	case '2':
-+	case '3':
-+	case '4':
-+	case '5':
-+	case '6':
-+	case '7':
-+		j--; /* need to re-read the first digit as
-+		      * part of the octal value */
-+		val = get_oct_char(s, &j);
-+		break;
-+	case 'x':
-+		val = get_hex_char(s, &j);
-+		break;
-+	default:
-+		val = c;
-+	}
-+
-+	(*i) = j;
-+	return val;
-+}
-diff --git a/util.h b/util.h
-index cc68933..f251480 100644
---- a/util.h
-+++ b/util.h
-@@ -64,4 +64,12 @@ extern char *join_path(const char *path, const char *name);
-  * @return 1 if a valid printable string, 0 if not */
- int util_is_printable_string(const void *data, int len);
- 
-+/*
-+ * Parse an escaped character starting at index i in string s.  The resulting
-+ * character will be returned and the index i will be updated to point at the
-+ * character directly after the end of the encoding, this may be the '\0'
-+ * terminator of the string.
-+ */
-+char get_escape_char(const char *s, int *i);
-+
- #endif /* _UTIL_H */
diff -Nru device-tree-compiler-1.4.2/debian/patches/07_Remove-gcc-4.6-set-but-not-used-warnings.patch device-tree-compiler-1.4.5/debian/patches/07_Remove-gcc-4.6-set-but-not-used-warnings.patch
--- device-tree-compiler-1.4.2/debian/patches/07_Remove-gcc-4.6-set-but-not-used-warnings.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/07_Remove-gcc-4.6-set-but-not-used-warnings.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Mon, 12 Sep 2011 01:18:43 +0000 (+1000)
-Subject: dtc: Remove gcc 4.6 "set but not used" warnings
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=83df28bd39979b32a75656cac291c36dbd4e5497
-
-dtc: Remove gcc 4.6 "set but not used" warnings
-
-A number of the dtc testcases trigger the new "variable set but not
-used" warning from gcc 4.6.  That is they have variables which are
-assigned, but then never read after that point.
-
-In a couple of cases this is just because the variables aren't needed,
-so this patch removes them.  In subnode_offset.c, it's because one
-pair of variables we clearly intended to test we don't actually test.
-This patch also adds this missing check.
-
-This patch makes the testsuite compile clean with gcc 4.6.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/tests/notfound.c b/tests/notfound.c
-index 38918ad..4d55b88 100644
---- a/tests/notfound.c
-+++ b/tests/notfound.c
-@@ -37,27 +37,25 @@ static void check_error(const char *s, int err)
- 
- int main(int argc, char *argv[])
- {
--	const struct fdt_property *prop;
- 	void *fdt;
- 	int offset;
- 	int subnode1_offset;
--	const void *val;
- 	int lenerr;
- 
- 	test_init(argc, argv);
- 	fdt = load_blob_arg(argc, argv);
- 
--	prop = fdt_get_property(fdt, 0, "nonexistant-property", &lenerr);
-+	fdt_get_property(fdt, 0, "nonexistant-property", &lenerr);
- 	check_error("fdt_get_property(\"nonexistant-property\")", lenerr);
- 
--	val = fdt_getprop(fdt, 0, "nonexistant-property", &lenerr);
-+	fdt_getprop(fdt, 0, "nonexistant-property", &lenerr);
- 	check_error("fdt_getprop(\"nonexistant-property\"", lenerr);
- 
- 	subnode1_offset = fdt_subnode_offset(fdt, 0, "subnode@1");
- 	if (subnode1_offset < 0)
- 		FAIL("Couldn't find subnode1: %s", fdt_strerror(subnode1_offset));
- 
--	val = fdt_getprop(fdt, subnode1_offset, "prop-str", &lenerr);
-+	fdt_getprop(fdt, subnode1_offset, "prop-str", &lenerr);
- 	check_error("fdt_getprop(\"prop-str\")", lenerr);
- 
- 	offset = fdt_subnode_offset(fdt, 0, "nonexistant-subnode");
-diff --git a/tests/path_offset.c b/tests/path_offset.c
-index bb092f1..d3e1f8e 100644
---- a/tests/path_offset.c
-+++ b/tests/path_offset.c
-@@ -104,5 +104,9 @@ int main(int argc, char *argv[])
- 		FAIL("Mismatch between subnode_offset (%d) and path_offset (%d)",
- 		     subsubnode2_offset, subsubnode2_offset_p);
- 
-+	if (subsubnode2_offset2 != subsubnode2_offset2_p)
-+		FAIL("Mismatch between subnode_offset (%d) and path_offset (%d)",
-+		     subsubnode2_offset2, subsubnode2_offset2_p);
-+
- 	PASS();
- }
-diff --git a/tests/subnode_offset.c b/tests/subnode_offset.c
-index b961070..e58c192 100644
---- a/tests/subnode_offset.c
-+++ b/tests/subnode_offset.c
-@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
- 	void *fdt;
- 	int subnode1_offset, subnode2_offset;
- 	int subsubnode1_offset, subsubnode2_offset, subsubnode2_offset2;
--	int ss11_off, ss12_off, ss21_off, ss22_off;
-+	int ss12_off, ss21_off;
- 
- 	test_init(argc, argv);
- 	fdt = load_blob_arg(argc, argv);
-@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
- 	if (subsubnode2_offset != subsubnode2_offset2)
- 		FAIL("Different offsets with and without unit address");
- 
--	ss11_off = check_subnode(fdt, subnode1_offset, "ss1");
-+	check_subnode(fdt, subnode1_offset, "ss1");
- 	ss21_off = fdt_subnode_offset(fdt, subnode2_offset, "ss1");
- 	if (ss21_off != -FDT_ERR_NOTFOUND)
- 		FAIL("Incorrectly found ss1 in subnode2");
-@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
- 	ss12_off = fdt_subnode_offset(fdt, subnode1_offset, "ss2");
- 	if (ss12_off != -FDT_ERR_NOTFOUND)
- 		FAIL("Incorrectly found ss2 in subnode1");
--	ss22_off = check_subnode(fdt, subnode2_offset, "ss2");
-+	check_subnode(fdt, subnode2_offset, "ss2");
- 
- 	PASS();
- }
diff -Nru device-tree-compiler-1.4.2/debian/patches/08_Support-character-literals-in-cell-lists.patch device-tree-compiler-1.4.5/debian/patches/08_Support-character-literals-in-cell-lists.patch
--- device-tree-compiler-1.4.2/debian/patches/08_Support-character-literals-in-cell-lists.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/08_Support-character-literals-in-cell-lists.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-From: Anton Staaf <robotboy@chromium.org>
-Date: Fri, 9 Sep 2011 19:16:30 +0000 (-0700)
-Subject: dtc: Support character literals in cell lists
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=a4ea2fa9518ff0f4d7f4a08647599a727faac2e0
-
-dtc: Support character literals in cell lists
-
-With this patch the following property assignment:
-
-    property = <0x12345678 'a' '\r' 100>;
-
-is equivalent to:
-
-    property = <0x12345678 0x00000061 0x0000000D 0x00000064>
-
-Signed-off-by: Anton Staaf <robotboy@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/Documentation/dts-format.txt b/Documentation/dts-format.txt
-index a655b87..eae8b76 100644
---- a/Documentation/dts-format.txt
-+++ b/Documentation/dts-format.txt
-@@ -33,7 +33,7 @@ Property values may be defined as an array of 32-bit integer cells, as
- NUL-terminated strings, as bytestrings or a combination of these.
- 
- * Arrays of cells are represented by angle brackets surrounding a
--  space separated list of C-style integers
-+  space separated list of C-style integers or character literals.
- 
- 	e.g. interrupts = <17 0xc>;
- 
-diff --git a/dtc-lexer.l b/dtc-lexer.l
-index e866ea5..494e342 100644
---- a/dtc-lexer.l
-+++ b/dtc-lexer.l
-@@ -29,6 +29,7 @@ PROPNODECHAR	[a-zA-Z0-9,._+*#?@-]
- PATHCHAR	({PROPNODECHAR}|[/])
- LABEL		[a-zA-Z_][a-zA-Z0-9_]*
- STRING		\"([^\\"]|\\.)*\"
-+CHAR_LITERAL	'([^']|\\')*'
- WS		[[:space:]]
- COMMENT		"/*"([^*]|\*+[^*/])*\*+"/"
- LINECOMMENT	"//".*\n
-@@ -109,6 +110,13 @@ static int pop_input_file(void);
- 			return DT_LITERAL;
- 		}
- 
-+<*>{CHAR_LITERAL}	{
-+			yytext[yyleng-1] = '\0';
-+			yylval.literal = xstrdup(yytext+1);
-+			DPRINT("Character literal: %s\n", yylval.literal);
-+			return DT_CHAR_LITERAL;
-+		}
-+
- <*>\&{LABEL}	{	/* label reference */
- 			DPRINT("Ref: %s\n", yytext+1);
- 			yylval.labelref = xstrdup(yytext+1);
-diff --git a/dtc-parser.y b/dtc-parser.y
-index 5e84a67..554f11a 100644
---- a/dtc-parser.y
-+++ b/dtc-parser.y
-@@ -34,6 +34,7 @@ extern struct boot_info *the_boot_info;
- extern int treesource_error;
- 
- static unsigned long long eval_literal(const char *s, int base, int bits);
-+static unsigned char eval_char_literal(const char *s);
- %}
- 
- %union {
-@@ -57,6 +58,7 @@ static unsigned long long eval_literal(const char *s, int base, int bits);
- %token DT_MEMRESERVE
- %token <propnodename> DT_PROPNODENAME
- %token <literal> DT_LITERAL
-+%token <literal> DT_CHAR_LITERAL
- %token <cbase> DT_BASE
- %token <byte> DT_BYTE
- %token <data> DT_STRING
-@@ -265,6 +267,10 @@ cellval:
- 		{
- 			$$ = eval_literal($1, 0, 32);
- 		}
-+	| DT_CHAR_LITERAL
-+		{
-+			$$ = eval_char_literal($1);
-+		}
- 	;
- 
- bytestring:
-@@ -343,3 +349,29 @@ static unsigned long long eval_literal(const char *s, int base, int bits)
- 		print_error("bad literal");
- 	return val;
- }
-+
-+static unsigned char eval_char_literal(const char *s)
-+{
-+	int i = 1;
-+	char c = s[0];
-+
-+	if (c == '\0')
-+	{
-+		print_error("empty character literal");
-+		return 0;
-+	}
-+
-+	/*
-+	 * If the first character in the character literal is a \ then process
-+	 * the remaining characters as an escape encoding. If the first
-+	 * character is neither an escape or a terminator it should be the only
-+	 * character in the literal and will be returned.
-+	 */
-+	if (c == '\\')
-+		c = get_escape_char(s, &i);
-+
-+	if (s[i] != '\0')
-+		print_error("malformed character literal");
-+
-+	return c;
-+}
-diff --git a/tests/.gitignore b/tests/.gitignore
-index f4e58b2..a3e9bd1 100644
---- a/tests/.gitignore
-+++ b/tests/.gitignore
-@@ -4,6 +4,7 @@
- /add_subnode_with_nops
- /asm_tree_dump
- /boot-cpuid
-+/char_literal
- /del_node
- /del_property
- /dtbs_equal_ordered
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index c564e72..e718b63 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -5,6 +5,7 @@ LIB_TESTS_L = get_mem_rsv \
- 	node_offset_by_prop_value node_offset_by_phandle \
- 	node_check_compatible node_offset_by_compatible \
- 	get_alias \
-+	char_literal \
- 	notfound \
- 	setprop_inplace nop_property nop_node \
- 	sw_tree1 \
-diff --git a/tests/char_literal.c b/tests/char_literal.c
-new file mode 100644
-index 0000000..150f2a0
---- /dev/null
-+++ b/tests/char_literal.c
-@@ -0,0 +1,50 @@
-+/*
-+ * libfdt - Flat Device Tree manipulation
-+ *	Testcase for character literals in dtc
-+ * Copyright (C) 2006 David Gibson, IBM Corporation.
-+ * Copyright (C) 2011 The Chromium Authors. All rights reserved.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License
-+ * as published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdint.h>
-+
-+#include <fdt.h>
-+#include <libfdt.h>
-+
-+#include "tests.h"
-+#include "testdata.h"
-+
-+int main(int argc, char *argv[])
-+{
-+	void *fdt;
-+	uint32_t expected_cells[5];
-+
-+	expected_cells[0] = cpu_to_fdt32((unsigned char)TEST_CHAR1);
-+	expected_cells[1] = cpu_to_fdt32((unsigned char)TEST_CHAR2);
-+	expected_cells[2] = cpu_to_fdt32((unsigned char)TEST_CHAR3);
-+	expected_cells[3] = cpu_to_fdt32((unsigned char)TEST_CHAR4);
-+	expected_cells[4] = cpu_to_fdt32((unsigned char)TEST_CHAR5);
-+
-+	test_init(argc, argv);
-+	fdt = load_blob_arg(argc, argv);
-+
-+	check_getprop(fdt, 0, "char-literal-cells",
-+		      sizeof(expected_cells), expected_cells);
-+
-+	PASS();
-+}
-diff --git a/tests/char_literal.dts b/tests/char_literal.dts
-new file mode 100644
-index 0000000..22e17ed
---- /dev/null
-+++ b/tests/char_literal.dts
-@@ -0,0 +1,5 @@
-+/dts-v1/;
-+
-+/ {
-+	char-literal-cells = <'\r' 'b' '\0' '\'' '\xff'>;
-+};
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index 72dda32..1246df1 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -206,6 +206,9 @@ dtc_tests () {
-     run_dtc_test -I dts -O dtb -o dtc_escapes.test.dtb escapes.dts
-     run_test string_escapes dtc_escapes.test.dtb
- 
-+    run_dtc_test -I dts -O dtb -o dtc_char_literal.test.dtb char_literal.dts
-+    run_test char_literal dtc_char_literal.test.dtb
-+
-     run_dtc_test -I dts -O dtb -o dtc_extra-terminating-null.test.dtb extra-terminating-null.dts
-     run_test extra-terminating-null dtc_extra-terminating-null.test.dtb
- 
-diff --git a/tests/testdata.h b/tests/testdata.h
-index 5b5a9a3..d4c6759 100644
---- a/tests/testdata.h
-+++ b/tests/testdata.h
-@@ -19,6 +19,12 @@
- #define TEST_STRING_2	"nastystring: \a\b\t\n\v\f\r\\\""
- #define TEST_STRING_3	"\xde\xad\xbe\xef"
- 
-+#define TEST_CHAR1	'\r'
-+#define TEST_CHAR2	'b'
-+#define TEST_CHAR3	'\0'
-+#define TEST_CHAR4	'\''
-+#define TEST_CHAR5	'\xff'
-+
- #ifndef __ASSEMBLY__
- extern struct fdt_header _test_tree1;
- extern struct fdt_header _truncated_property;
diff -Nru device-tree-compiler-1.4.2/debian/patches/09_Create-Makefile_utils-and-move-ftdump-into-it.patch device-tree-compiler-1.4.5/debian/patches/09_Create-Makefile_utils-and-move-ftdump-into-it.patch
--- device-tree-compiler-1.4.2/debian/patches/09_Create-Makefile_utils-and-move-ftdump-into-it.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/09_Create-Makefile_utils-and-move-ftdump-into-it.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Wed, 21 Sep 2011 20:32:44 +0000 (-0700)
-Subject: Create Makefile.utils and move ftdump into it
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=9ebd9b4a56e54656431111e5ea7cd74e651910bf
-
-Create Makefile.utils and move ftdump into it
-
-We want to avoid a separate Makefile include for each utility, so this sets
-up a general one for utilities.
-
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
-
-diff --git a/Makefile b/Makefile
-index 2172d9a..380a705 100644
---- a/Makefile
-+++ b/Makefile
-@@ -105,7 +105,7 @@ endef
- 
- include Makefile.convert-dtsv0
- include Makefile.dtc
--include Makefile.ftdump
-+include Makefile.utils
- 
- BIN += convert-dtsv0
- BIN += dtc
-diff --git a/Makefile.ftdump b/Makefile.ftdump
-deleted file mode 100644
-index 2744a18..0000000
---- a/Makefile.ftdump
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#
--# This is not a complete Makefile of itself.
--# Instead, it is designed to be easily embeddable
--# into other systems of Makefiles.
--#
--
--FTDUMP_SRCS = \
--	ftdump.c \
--	util.c
--
--FTDUMP_GEN_SRCS =
--
--FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o) $(FTDUMP_GEN_SRCS:%.c=%.o)
-diff --git a/Makefile.utils b/Makefile.utils
-new file mode 100644
-index 0000000..0ed9297
---- /dev/null
-+++ b/Makefile.utils
-@@ -0,0 +1,10 @@
-+#
-+# This is not a complete Makefile of itself.  Instead, it is designed to
-+# be easily embeddable into other systems of Makefiles.
-+#
-+
-+FTDUMP_SRCS = \
-+	ftdump.c \
-+	util.c
-+
-+FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o)
diff -Nru device-tree-compiler-1.4.2/debian/patches/10_Add-fdt-read_write-utility-functions.patch device-tree-compiler-1.4.5/debian/patches/10_Add-fdt-read_write-utility-functions.patch
--- device-tree-compiler-1.4.2/debian/patches/10_Add-fdt-read_write-utility-functions.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/10_Add-fdt-read_write-utility-functions.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,502 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Thu, 22 Sep 2011 17:11:02 +0000 (-0700)
-Subject: Add fdt read/write utility functions
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=36204fdf742cabc074617648a5b2cf62409dc40b
-
-Add fdt read/write utility functions
-
-This adds higher-level libfdt operations for reading/writing an fdt
-blob from/to a file, as well as a function to decode a data type string
-as will be used by fdtget, fdtput.
-
-This also adds a few tests for the simple type argument supported by
-utilfdt_decode_type.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/Makefile b/Makefile
-index 380a705..b32409b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ EXTRAVERSION =
- LOCAL_VERSION =
- CONFIG_LOCALVERSION =
- 
--CPPFLAGS = -I libfdt
-+CPPFLAGS = -I libfdt -I .
- WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
- 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls
- CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index e718b63..41695df 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -16,7 +16,8 @@ LIB_TESTS_L = get_mem_rsv \
- 	extra-terminating-null \
- 	dtbs_equal_ordered \
- 	dtb_reverse dtbs_equal_unordered \
--	add_subnode_with_nops path_offset_aliases
-+	add_subnode_with_nops path_offset_aliases \
-+	utilfdt_test
- LIB_TESTS = $(LIB_TESTS_L:%=$(TESTS_PREFIX)%)
- 
- LIBTREE_TESTS_L = truncated_property
-@@ -42,7 +43,7 @@ TESTS_CLEANFILES = $(TESTS) $(TESTS_CLEANFILES_L:%=$(TESTS_PREFIX)%)
- .PHONY: tests
- tests:	$(TESTS) $(TESTS_TREES)
- 
--$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
-+$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 
- $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
- 	@$(VECHO) LD [libdl] $@
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index 1246df1..e2c3046 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -391,6 +391,10 @@ dtbs_equal_tests () {
-     cmp_tests test_tree1.dtb $WRONG_TREE1
- }
- 
-+utilfdt_tests () {
-+    run_test utilfdt_test
-+}
-+
- while getopts "vt:m" ARG ; do
-     case $ARG in
- 	"v")
-@@ -406,7 +410,7 @@ while getopts "vt:m" ARG ; do
- done
- 
- if [ -z "$TESTSETS" ]; then
--    TESTSETS="libfdt dtc dtbs_equal"
-+    TESTSETS="libfdt utilfdt dtc dtbs_equal"
- fi
- 
- # Make sure we don't have stale blobs lying around
-@@ -417,6 +421,9 @@ for set in $TESTSETS; do
- 	"libfdt")
- 	    libfdt_tests
- 	    ;;
-+	"utilfdt")
-+	    utilfdt_tests
-+	    ;;
- 	"dtc")
- 	    dtc_tests
- 	    ;;
-diff --git a/tests/tests.h b/tests/tests.h
-index fcb2b2a..a51556d 100644
---- a/tests/tests.h
-+++ b/tests/tests.h
-@@ -93,22 +93,6 @@ void cleanup(void);
- 		exit(RC_BUG);				\
- 	} while (0)
- 
--static inline void *xmalloc(size_t size)
--{
--	void *p = malloc(size);
--	if (! p)
--		FAIL("malloc() failure");
--	return p;
--}
--
--static inline void *xrealloc(void *p, size_t size)
--{
--	p = realloc(p, size);
--	if (! p)
--		FAIL("realloc() failure");
--	return p;
--}
--
- void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size);
- 
- void check_property(void *fdt, int nodeoffset, const char *name,
-@@ -135,4 +119,6 @@ void *load_blob_arg(int argc, char *argv[]);
- void save_blob(const char *filename, void *blob);
- void *open_blob_rw(void *blob);
- 
-+#include "util.h"
-+
- #endif /* _TESTS_H */
-diff --git a/tests/utilfdt_test.c b/tests/utilfdt_test.c
-new file mode 100644
-index 0000000..36b4aa5
---- /dev/null
-+++ b/tests/utilfdt_test.c
-@@ -0,0 +1,128 @@
-+/*
-+ * Copyright 2011 The Chromium Authors, All Rights Reserved.
-+ *
-+ * utilfdt_test - Tests for utilfdt library
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License
-+ * as published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+#include <assert.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdint.h>
-+#include <stdarg.h>
-+
-+#include <fdt.h>
-+#include <libfdt.h>
-+#include <util.h>
-+
-+#include "tests.h"
-+#include "testdata.h"
-+
-+static void check(const char *fmt, int expect_type, int expect_size)
-+{
-+	int type;
-+	int size;
-+
-+	if (utilfdt_decode_type(fmt, &type, &size))
-+		FAIL("format '%s': valid format string returned failure", fmt);
-+	if (expect_type != type)
-+		FAIL("format '%s': expected type='%c', got type='%c'", fmt,
-+		     expect_type, type);
-+	if (expect_size != size)
-+		FAIL("format '%s': expected size=%d, got size=%d", fmt,
-+		     expect_size, size);
-+}
-+
-+static void checkfail(const char *fmt)
-+{
-+	int type;
-+	int size;
-+
-+	if (!utilfdt_decode_type(fmt, &type, &size))
-+		FAIL("format '%s': invalid format string returned success",
-+		     fmt);
-+}
-+
-+/**
-+ * Add the given modifier to each of the valid sizes, and check that we get
-+ * correct values.
-+ *
-+ * \param modifier	Modifer string to use as a prefix
-+ * \param expected_size	The size (in bytes) that we expect (ignored for
-+ *			strings)
-+ */
-+static void check_sizes(char *modifier, int expected_size)
-+{
-+	char fmt[10], *ptr;
-+
-+	/* set up a string with a hole in it for the format character */
-+	if (strlen(modifier) + 2 >= sizeof(fmt))
-+		FAIL("modifier string '%s' too long", modifier);
-+	strcpy(fmt, modifier);
-+	ptr = fmt + strlen(fmt);
-+	ptr[1] = '\0';
-+
-+	/* now try each format character in turn */
-+	*ptr = 'i';
-+	check(fmt, 'i', expected_size);
-+
-+	*ptr = 'u';
-+	check(fmt, 'u', expected_size);
-+
-+	*ptr = 'x';
-+	check(fmt, 'x', expected_size);
-+
-+	*ptr = 's';
-+	check(fmt, 's', -1);
-+}
-+
-+static void test_utilfdt_decode_type(void)
-+{
-+	char fmt[10];
-+	int ch;
-+
-+	/* check all the valid modifiers and sizes */
-+	check_sizes("", -1);
-+	check_sizes("b", 1);
-+	check_sizes("hh", 1);
-+	check_sizes("h", 2);
-+	check_sizes("l", 4);
-+
-+	/* try every other character */
-+	checkfail("");
-+	for (ch = ' '; ch < 127; ch++) {
-+		if (!strchr("iuxs", ch)) {
-+			*fmt = ch;
-+			fmt[1] = '\0';
-+			checkfail(fmt);
-+		}
-+	}
-+
-+	/* try a few modifiers at the end */
-+	checkfail("sx");
-+	checkfail("ihh");
-+	checkfail("xb");
-+
-+	/* and one for the doomsday archives */
-+	checkfail("He has all the virtues I dislike and none of the vices "
-+			"I admire.");
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+	test_utilfdt_decode_type();
-+	PASS();
-+}
-diff --git a/util.c b/util.c
-index 6d07292..d82d41f 100644
---- a/util.c
-+++ b/util.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright 2011 The Chromium Authors, All Rights Reserved.
-  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
-  *
-  * util_is_printable_string contributed by
-@@ -27,6 +28,11 @@
- #include <string.h>
- #include <assert.h>
- 
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include "libfdt.h"
- #include "util.h"
- 
- char *xstrdup(const char *s)
-@@ -184,3 +190,139 @@ char get_escape_char(const char *s, int *i)
- 	(*i) = j;
- 	return val;
- }
-+
-+int utilfdt_read_err(const char *filename, char **buffp)
-+{
-+	int fd = 0;	/* assume stdin */
-+	char *buf = NULL;
-+	off_t bufsize = 1024, offset = 0;
-+	int ret = 0;
-+
-+	*buffp = NULL;
-+	if (strcmp(filename, "-") != 0) {
-+		fd = open(filename, O_RDONLY);
-+		if (fd < 0)
-+			return errno;
-+	}
-+
-+	/* Loop until we have read everything */
-+	buf = malloc(bufsize);
-+	do {
-+		/* Expand the buffer to hold the next chunk */
-+		if (offset == bufsize) {
-+			bufsize *= 2;
-+			buf = realloc(buf, bufsize);
-+			if (!buf) {
-+				ret = ENOMEM;
-+				break;
-+			}
-+		}
-+
-+		ret = read(fd, &buf[offset], bufsize - offset);
-+		if (ret < 0) {
-+			ret = errno;
-+			break;
-+		}
-+		offset += ret;
-+	} while (ret != 0);
-+
-+	/* Clean up, including closing stdin; return errno on error */
-+	close(fd);
-+	if (ret)
-+		free(buf);
-+	else
-+		*buffp = buf;
-+	return ret;
-+}
-+
-+char *utilfdt_read(const char *filename)
-+{
-+	char *buff;
-+	int ret = utilfdt_read_err(filename, &buff);
-+
-+	if (ret) {
-+		fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
-+			strerror(ret));
-+		return NULL;
-+	}
-+	/* Successful read */
-+	return buff;
-+}
-+
-+int utilfdt_write_err(const char *filename, const void *blob)
-+{
-+	int fd = 1;	/* assume stdout */
-+	int totalsize;
-+	int offset;
-+	int ret = 0;
-+	const char *ptr = blob;
-+
-+	if (strcmp(filename, "-") != 0) {
-+		fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-+		if (fd < 0)
-+			return errno;
-+	}
-+
-+	totalsize = fdt_totalsize(blob);
-+	offset = 0;
-+
-+	while (offset < totalsize) {
-+		ret = write(fd, ptr + offset, totalsize - offset);
-+		if (ret < 0) {
-+			ret = -errno;
-+			break;
-+		}
-+		offset += ret;
-+	}
-+	/* Close the file/stdin; return errno on error */
-+	if (fd != 1)
-+		close(fd);
-+	return ret < 0 ? -ret : 0;
-+}
-+
-+
-+int utilfdt_write(const char *filename, const void *blob)
-+{
-+	int ret = utilfdt_write_err(filename, blob);
-+
-+	if (ret) {
-+		fprintf(stderr, "Couldn't write blob to '%s': %s\n", filename,
-+			strerror(ret));
-+	}
-+	return ret ? -1 : 0;
-+}
-+
-+int utilfdt_decode_type(const char *fmt, int *type, int *size)
-+{
-+	int qualifier = 0;
-+
-+	/* get the conversion qualifier */
-+	*size = -1;
-+	if (strchr("hlLb", *fmt)) {
-+		qualifier = *fmt++;
-+		if (qualifier == *fmt) {
-+			switch (*fmt++) {
-+/* TODO:		case 'l': qualifier = 'L'; break;*/
-+			case 'h':
-+				qualifier = 'b';
-+				break;
-+			}
-+		}
-+	}
-+
-+	/* we should now have a type */
-+	if (!strchr("iuxs", *fmt))
-+		return -1;
-+
-+	/* convert qualifier (bhL) to byte size */
-+	if (*fmt != 's')
-+		*size = qualifier == 'b' ? 1 :
-+				qualifier == 'h' ? 2 :
-+				qualifier == 'l' ? 4 : -1;
-+	*type = *fmt++;
-+
-+	/* that should be it! */
-+	if (*fmt)
-+		return -1;
-+	return 0;
-+}
-diff --git a/util.h b/util.h
-index f251480..730918e 100644
---- a/util.h
-+++ b/util.h
-@@ -4,6 +4,7 @@
- #include <stdarg.h>
- 
- /*
-+ * Copyright 2011 The Chromium Authors, All Rights Reserved.
-  * Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -72,4 +73,71 @@ int util_is_printable_string(const void *data, int len);
-  */
- char get_escape_char(const char *s, int *i);
- 
-+/**
-+ * Read a device tree file into a buffer. This will report any errors on
-+ * stderr.
-+ *
-+ * @param filename	The filename to read, or - for stdin
-+ * @return Pointer to allocated buffer containing fdt, or NULL on error
-+ */
-+char *utilfdt_read(const char *filename);
-+
-+/**
-+ * Read a device tree file into a buffer. Does not report errors, but only
-+ * returns them. The value returned can be passed to strerror() to obtain
-+ * an error message for the user.
-+ *
-+ * @param filename	The filename to read, or - for stdin
-+ * @param buffp		Returns pointer to buffer containing fdt
-+ * @return 0 if ok, else an errno value representing the error
-+ */
-+int utilfdt_read_err(const char *filename, char **buffp);
-+
-+
-+/**
-+ * Write a device tree buffer to a file. This will report any errors on
-+ * stderr.
-+ *
-+ * @param filename	The filename to write, or - for stdout
-+ * @param blob		Poiner to buffer containing fdt
-+ * @return 0 if ok, -1 on error
-+ */
-+int utilfdt_write(const char *filename, const void *blob);
-+
-+/**
-+ * Write a device tree buffer to a file. Does not report errors, but only
-+ * returns them. The value returned can be passed to strerror() to obtain
-+ * an error message for the user.
-+ *
-+ * @param filename	The filename to write, or - for stdout
-+ * @param blob		Poiner to buffer containing fdt
-+ * @return 0 if ok, else an errno value representing the error
-+ */
-+int utilfdt_write_err(const char *filename, const void *blob);
-+
-+/**
-+ * Decode a data type string. The purpose of this string
-+ *
-+ * The string consists of an optional character followed by the type:
-+ *	Modifier characters:
-+ *		hh or b	1 byte
-+ *		h	2 byte
-+ *		l	4 byte, default
-+ *
-+ *	Type character:
-+ *		s	string
-+ *		i	signed integer
-+ *		u	unsigned integer
-+ *		x	hex
-+ *
-+ * TODO: Implement ll modifier (8 bytes)
-+ * TODO: Implement o type (octal)
-+ *
-+ * @param fmt		Format string to process
-+ * @param type		Returns type found(s/d/u/x), or 0 if none
-+ * @param size		Returns size found(1,2,4,8) or 4 if none
-+ * @return 0 if ok, -1 on error (no type given, or other invalid format)
-+ */
-+int utilfdt_decode_type(const char *fmt, int *type, int *size);
-+
- #endif /* _UTIL_H */
diff -Nru device-tree-compiler-1.4.2/debian/patches/11_Make-testutils-use-utilfdt.patch device-tree-compiler-1.4.5/debian/patches/11_Make-testutils-use-utilfdt.patch
--- device-tree-compiler-1.4.2/debian/patches/11_Make-testutils-use-utilfdt.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/11_Make-testutils-use-utilfdt.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Thu, 22 Sep 2011 17:11:03 +0000 (-0700)
-Subject: Make testutils use utilfdt
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=1c25c0d520dee58bfd86626a07036fe9febfebe6
-
-Make testutils use utilfdt
-
-The load_blob() and save_blob() functions are very similar to the utilfdt
-versions. This removes the duplicated code.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index 41695df..cae8390 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -45,11 +45,12 @@ tests:	$(TESTS) $(TESTS_TREES)
- 
- $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 
--$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
-+$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 	@$(VECHO) LD [libdl] $@
- 	$(LINK.c) -o $@ $^ -ldl
- 
--$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(LIBFDT_archive)
-+$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
-+		util.o $(LIBFDT_archive)
- 
- $(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o
- 
-diff --git a/tests/testutils.c b/tests/testutils.c
-index b0a2230..f185133 100644
---- a/tests/testutils.c
-+++ b/tests/testutils.c
-@@ -159,33 +159,13 @@ int nodename_eq(const char *s1, const char *s2)
- 
- void *load_blob(const char *filename)
- {
--	int fd;
--	int offset = 0;
--	int bufsize = 1024;
--	char *p = NULL;
--	int ret;
--
--	fd = open(filename, O_RDONLY);
--	if (fd < 0)
--		CONFIG("Couldn't open blob from \"%s\": %s", filename,
--		       strerror(errno));
--
--	p = xmalloc(bufsize);
--	do {
--		if (offset == bufsize) {
--			bufsize *= 2;
--			p = xrealloc(p, bufsize);
--		}
--
--		ret = read(fd, &p[offset], bufsize - offset);
--		if (ret < 0)
--			CONFIG("Couldn't read from \"%s\": %s", filename,
--			       strerror(errno));
--
--		offset += ret;
--	} while (ret != 0);
-+	char *blob;
-+	int ret = utilfdt_read_err(filename, &blob);
- 
--	return p;
-+	if (ret)
-+		CONFIG("Couldn't open blob from \"%s\": %s", filename,
-+		       strerror(ret));
-+	return blob;
- }
- 
- void *load_blob_arg(int argc, char *argv[])
-@@ -197,28 +177,11 @@ void *load_blob_arg(int argc, char *argv[])
- 
- void save_blob(const char *filename, void *fdt)
- {
--	int fd;
--	int totalsize;
--	int offset;
--	char *p;
--	int ret;
--
--	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
--	if (fd < 0)
--		CONFIG("Couldn't open \"%s\" to write blob: %s", filename,
--		       strerror(errno));
--
--	totalsize = fdt_totalsize(fdt);
--	offset = 0;
--	p = fdt;
--
--	while (offset < totalsize) {
--		ret = write(fd, p + offset, totalsize - offset);
--		if (ret < 0)
--			CONFIG("Couldn't write to \"%s\": %s", filename,
--			       strerror(errno));
--		offset += ret;
--	}
-+	int ret = utilfdt_write_err(filename, fdt);
-+
-+	if (ret)
-+		CONFIG("Couldn't write blob to \"%s\": %s", filename,
-+		       strerror(ret));
- }
- 
- void *open_blob_rw(void *blob)
diff -Nru device-tree-compiler-1.4.2/debian/patches/12_use-utilfdt-to-read-blob.patch device-tree-compiler-1.4.5/debian/patches/12_use-utilfdt-to-read-blob.patch
--- device-tree-compiler-1.4.2/debian/patches/12_use-utilfdt-to-read-blob.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/12_use-utilfdt-to-read-blob.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-From: Simon Glass <sjg@chromium.org>
-Date: Thu, 22 Sep 2011 17:11:04 +0000 (-0700)
-Subject: ftdump: use utilfdt to read blob
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=07a8691fbbeb2a7e0cff85fb24435e2dc71facaf
-
-ftdump: use utilfdt to read blob
-
-Now that we have utilfdt_read(), ftdump should use it too.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/ftdump.c b/ftdump.c
-index db932e3..cc55fe2 100644
---- a/ftdump.c
-+++ b/ftdump.c
-@@ -13,8 +13,6 @@
- 
- #include "util.h"
- 
--#define FTDUMP_BUF_SIZE	65536
--
- #define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
- #define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a))))
- #define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
-@@ -147,40 +145,18 @@ static void dump_blob(void *blob)
- 
- int main(int argc, char *argv[])
- {
--	FILE *fp;
- 	char *buf;
--	int size;
- 
- 	if (argc < 2) {
- 		fprintf(stderr, "supply input filename\n");
- 		return 5;
- 	}
- 
--	if (strcmp(argv[1], "-") == 0) {
--		fp = stdin;
--	} else {
--		fp = fopen(argv[1], "rb");
--		if (fp == NULL) {
--			fprintf(stderr, "unable to open %s\n", argv[1]);
--			return 10;
--		}
--	}
--
--	buf = malloc(FTDUMP_BUF_SIZE);
--	if (!buf) {
--		fprintf(stderr, "Couldn't allocate %d byte buffer\n", FTDUMP_BUF_SIZE);
-+	buf = utilfdt_read(argv[1]);
-+	if (buf)
-+		dump_blob(buf);
-+	else
- 		return 10;
--	}
--
--	size = fread(buf, 1, FTDUMP_BUF_SIZE, fp);
--	if (size == FTDUMP_BUF_SIZE) {
--		fprintf(stderr, "file too large (maximum is %d bytes)\n", FTDUMP_BUF_SIZE);
--		return 10;
--	}
--
--	dump_blob(buf);
--
--	fclose(fp);
- 
- 	return 0;
- }
diff -Nru device-tree-compiler-1.4.2/debian/patches/13_Add-fdt16_to_cpu-utility-function.patch device-tree-compiler-1.4.5/debian/patches/13_Add-fdt16_to_cpu-utility-function.patch
--- device-tree-compiler-1.4.2/debian/patches/13_Add-fdt16_to_cpu-utility-function.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/13_Add-fdt16_to_cpu-utility-function.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-From: Anton Staaf <robotboy@chromium.org>
-Date: Tue, 11 Oct 2011 17:22:27 +0000 (-0700)
-Subject: libfdt: Add fdt16_to_cpu utility function
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=2cd4c8d27d6b5ea83723754da4eba5d51aa71b95
-
-libfdt: Add fdt16_to_cpu utility function
-
-This utility routine will be used in the variable size cell literal
-append code.  It is a straightforward adaptation of the fdt32_to_cpu
-function.
-
-Signed-off-by: Anton Staaf <robotboy@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
-index 449bf60..da952e7 100644
---- a/libfdt/libfdt_env.h
-+++ b/libfdt/libfdt_env.h
-@@ -6,6 +6,12 @@
- #include <string.h>
- 
- #define _B(n)	((unsigned long long)((uint8_t *)&x)[n])
-+static inline uint16_t fdt16_to_cpu(uint16_t x)
-+{
-+	return (_B(0) << 8) | _B(1);
-+}
-+#define cpu_to_fdt16(x) fdt16_to_cpu(x)
-+
- static inline uint32_t fdt32_to_cpu(uint32_t x)
- {
- 	return (_B(0) << 24) | (_B(1) << 16) | (_B(2) << 8) | _B(3);
diff -Nru device-tree-compiler-1.4.2/debian/patches/14_Add-data_append_integer-function.patch device-tree-compiler-1.4.5/debian/patches/14_Add-data_append_integer-function.patch
--- device-tree-compiler-1.4.2/debian/patches/14_Add-data_append_integer-function.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/14_Add-data_append_integer-function.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-From: Anton Staaf <robotboy@chromium.org>
-Date: Tue, 11 Oct 2011 17:22:28 +0000 (-0700)
-Subject: dtc: Add data_append_integer function
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=a4b515c03804dbc0eff5bbf281bd22438717e773
-
-dtc: Add data_append_integer function
-
-This function deals with appending integers of various sizes (8, 16
-32, and 64 bit currently).  It handles endianess conversions.  If the
-integer will not fit in the requested number of bits of storage it
-will have it's high bits ignored.
-
-This patch also rewrites data_append_cell and data_append_addr to use
-data_append_integer.
-
-Signed-off-by: Anton Staaf <robotboy@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/data.c b/data.c
-index b5f3066..4a40c5b 100644
---- a/data.c
-+++ b/data.c
-@@ -168,11 +168,33 @@ struct data data_merge(struct data d1, struct data d2)
- 	return d;
- }
- 
--struct data data_append_cell(struct data d, cell_t word)
-+struct data data_append_integer(struct data d, uint64_t value, int bits)
- {
--	cell_t beword = cpu_to_fdt32(word);
--
--	return data_append_data(d, &beword, sizeof(beword));
-+	uint8_t value_8;
-+	uint16_t value_16;
-+	uint32_t value_32;
-+	uint64_t value_64;
-+
-+	switch (bits) {
-+	case 8:
-+		value_8 = value;
-+		return data_append_data(d, &value_8, 1);
-+
-+	case 16:
-+		value_16 = cpu_to_fdt16(value);
-+		return data_append_data(d, &value_16, 2);
-+
-+	case 32:
-+		value_32 = cpu_to_fdt32(value);
-+		return data_append_data(d, &value_32, 4);
-+
-+	case 64:
-+		value_64 = cpu_to_fdt64(value);
-+		return data_append_data(d, &value_64, 8);
-+
-+	default:
-+		die("Invalid literal size (%d)\n", bits);
-+	}
- }
- 
- struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
-@@ -185,11 +207,14 @@ struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
- 	return data_append_data(d, &bere, sizeof(bere));
- }
- 
--struct data data_append_addr(struct data d, uint64_t addr)
-+struct data data_append_cell(struct data d, cell_t word)
- {
--	uint64_t beaddr = cpu_to_fdt64(addr);
-+	return data_append_integer(d, word, sizeof(word) * 8);
-+}
- 
--	return data_append_data(d, &beaddr, sizeof(beaddr));
-+struct data data_append_addr(struct data d, uint64_t addr)
-+{
-+	return data_append_integer(d, addr, sizeof(addr) * 8);
- }
- 
- struct data data_append_byte(struct data d, uint8_t byte)
-diff --git a/dtc.h b/dtc.h
-index f37c97e..7b4c65b 100644
---- a/dtc.h
-+++ b/dtc.h
-@@ -109,6 +109,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m,
- 				  const void *p, int len);
- struct data data_merge(struct data d1, struct data d2);
- struct data data_append_cell(struct data d, cell_t word);
-+struct data data_append_integer(struct data d, uint64_t word, int bits);
- struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);
- struct data data_append_addr(struct data d, uint64_t addr);
- struct data data_append_byte(struct data d, uint8_t byte);
diff -Nru device-tree-compiler-1.4.2/debian/patches/15_Add-support-for-variable-sized-elements.patch device-tree-compiler-1.4.5/debian/patches/15_Add-support-for-variable-sized-elements.patch
--- device-tree-compiler-1.4.2/debian/patches/15_Add-support-for-variable-sized-elements.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/15_Add-support-for-variable-sized-elements.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,400 +0,0 @@
-From: Anton Staaf <robotboy@chromium.org>
-Date: Tue, 11 Oct 2011 17:22:29 +0000 (-0700)
-Subject: dtc: Add support for variable sized elements
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=033089f29099bdfd5c2d6986cdb9fd07b16cfde0
-
-dtc: Add support for variable sized elements
-
-Elements of size 8, 16, 32, and 64 bits are supported.  The new
-/bits/ syntax was selected so as to not pollute the reserved
-keyword space with uint8/uint16/... type names.
-
-With this patch the following property assignment:
-
-    property = /bits/ 16 <0x1234 0x5678 0x0 0xffff>;
-
-is equivalent to:
-
-    property = <0x12345678 0x0000ffff>;
-
-It is now also possible to directly specify a 64 bit literal in a
-cell list, also known as an array using:
-
-    property = /bits/ 64 <0xdeadbeef00000000>;
-
-It is an error to attempt to store a literal into an element that is
-too small to hold the literal, and the compiler will generate an
-error when it detects this.  For instance:
-
-    property = /bits/ 8 <256>;
-
-Will fail to compile.  It is also an error to attempt to place a
-reference in a non 32-bit element.
-
-The documentation has been changed to reflect that the cell list
-is now an array of elements that can be of sizes other than the
-default 32-bit cell size.
-
-The sized_cells test tests the creation and access of 8, 16, 32,
-and 64-bit sized elements.  It also tests that the creation of two
-properties, one with 16 bit elements and one with 32 bit elements
-result in the same property contents.
-
-Signed-off-by: Anton Staaf <robotboy@chromium.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-diff --git a/Documentation/dts-format.txt b/Documentation/dts-format.txt
-index eae8b76..41741df 100644
---- a/Documentation/dts-format.txt
-+++ b/Documentation/dts-format.txt
-@@ -29,18 +29,28 @@ except for properties with empty (zero length) value which have the
- form:
- 	[label:] property-name;
- 
--Property values may be defined as an array of 32-bit integer cells, as
--NUL-terminated strings, as bytestrings or a combination of these.
-+Property values may be defined as an array of 8, 16, 32, or 64-bit integer
-+elements, as NUL-terminated strings, as bytestrings or a combination of these.
- 
--* Arrays of cells are represented by angle brackets surrounding a
--  space separated list of C-style integers or character literals.
-+* Arrays are represented by angle brackets surrounding a space separated list
-+  of C-style integers or character literals.  Array elements default to 32-bits
-+  in size.  An array of 32-bit elements is also known as a cell list or a list
-+  of cells.  A cell being an unsigned 32-bit integer.
- 
- 	e.g. interrupts = <17 0xc>;
- 
--* A 64-bit value is represented with two 32-bit cells.
-+* A 64-bit value can be represented with two 32-bit elements.
- 
- 	e.g. clock-frequency = <0x00000001 0x00000000>;
- 
-+* The storage size of an element can be changed using the /bits/ prefix.  The
-+  /bits/ prefix allows for the creation of 8, 16, 32, and 64-bit elements.
-+  The resulting array will not be padded to a multiple of the default 32-bit
-+  element size.
-+
-+	e.g. interrupts = /bits/ 8 <17 0xc>;
-+	e.g. clock-frequency = /bits/ 64 <0x0000000100000000>;
-+
- * A NUL-terminated string value is represented using double quotes
-   (the property value is considered to include the terminating NUL
-   character).
-@@ -59,19 +69,20 @@ NUL-terminated strings, as bytestrings or a combination of these.
- 	e.g. compatible = "ns16550", "ns8250";
- 	     example = <0xf00f0000 19>, "a strange property format";
- 
--* In a cell array a reference to another node will be expanded to that
--  node's phandle.  References may by '&' followed by a node's label:
-+* In an array a reference to another node will be expanded to that node's
-+  phandle.  References may by '&' followed by a node's label:
- 	e.g. interrupt-parent = < &mpic >;
-   or they may be '&' followed by a node's full path in braces:
- 	e.g. interrupt-parent = < &{/soc/interrupt-controller@40000} >;
-+  References are only permitted in arrays that have an element size of
-+  32-bits.
- 
--* Outside a cell array, a reference to another node will be expanded
--  to that node's full path.
-+* Outside an array, a reference to another node will be expanded to that
-+  node's full path.
- 	e.g. ethernet0 = &EMAC0;
- 
- * Labels may also appear before or after any component of a property
--  value, or between cells of a cell array, or between bytes of a
--  bytestring.
-+  value, or between elements of an array, or between bytes of a bytestring.
- 	e.g. reg = reglabel: <0 sizelabel: 0x1000000>;
- 	e.g. prop = [ab cd ef byte4: 00 ff fe];
- 	e.g. str = start: "string value" end: ;
-@@ -108,3 +119,4 @@ Version 1 DTS files have the overall layout:
- 
- 	-- David Gibson <david@gibson.dropbear.id.au>
- 	-- Yoder Stuart <stuart.yoder@freescale.com>
-+	-- Anton Staaf <robotboy@chromium.org>
-diff --git a/dtc-lexer.l b/dtc-lexer.l
-index 494e342..73d190c 100644
---- a/dtc-lexer.l
-+++ b/dtc-lexer.l
-@@ -97,6 +97,12 @@ static int pop_input_file(void);
- 			return DT_MEMRESERVE;
- 		}
- 
-+<*>"/bits/"	{
-+			DPRINT("Keyword: /bits/\n");
-+			BEGIN_DEFAULT();
-+			return DT_BITS;
-+		}
-+
- <*>{LABEL}:	{
- 			DPRINT("Label: %s\n", yytext);
- 			yylval.labelref = xstrdup(yytext);
-diff --git a/dtc-parser.y b/dtc-parser.y
-index 554f11a..348616b 100644
---- a/dtc-parser.y
-+++ b/dtc-parser.y
-@@ -45,8 +45,12 @@ static unsigned char eval_char_literal(const char *s);
- 	uint8_t byte;
- 	struct data data;
- 
-+	struct {
-+		struct data	data;
-+		int		bits;
-+	} array;
-+
- 	uint64_t addr;
--	cell_t cell;
- 	struct property *prop;
- 	struct property *proplist;
- 	struct node *node;
-@@ -56,6 +60,7 @@ static unsigned char eval_char_literal(const char *s);
- 
- %token DT_V1
- %token DT_MEMRESERVE
-+%token DT_BITS
- %token <propnodename> DT_PROPNODENAME
- %token <literal> DT_LITERAL
- %token <literal> DT_CHAR_LITERAL
-@@ -71,8 +76,7 @@ static unsigned char eval_char_literal(const char *s);
- %type <re> memreserve
- %type <re> memreserves
- %type <addr> addr
--%type <data> celllist
--%type <cell> cellval
-+%type <array> arrayprefix
- %type <data> bytestring
- %type <prop> propdef
- %type <proplist> proplist
-@@ -182,9 +186,9 @@ propdata:
- 		{
- 			$$ = data_merge($1, $2);
- 		}
--	| propdataprefix '<' celllist '>'
-+	| propdataprefix arrayprefix '>'
- 		{
--			$$ = data_merge($1, $3);
-+			$$ = data_merge($1, $2.data);
- 		}
- 	| propdataprefix '[' bytestring ']'
- 		{
-@@ -242,34 +246,56 @@ propdataprefix:
- 		}
- 	;
- 
--celllist:
--	  /* empty */
-+arrayprefix:
-+	DT_BITS DT_LITERAL '<'
- 		{
--			$$ = empty_data;
-+			$$.data = empty_data;
-+			$$.bits = eval_literal($2, 0, 7);
-+
-+			if (($$.bits !=  8) &&
-+			    ($$.bits != 16) &&
-+			    ($$.bits != 32) &&
-+			    ($$.bits != 64))
-+			{
-+				print_error("Only 8, 16, 32 and 64-bit elements"
-+					    " are currently supported");
-+				$$.bits = 32;
-+			}
- 		}
--	| celllist cellval
-+	| '<'
- 		{
--			$$ = data_append_cell($1, $2);
-+			$$.data = empty_data;
-+			$$.bits = 32;
- 		}
--	| celllist DT_REF
-+	| arrayprefix DT_LITERAL
- 		{
--			$$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
--							      $2), -1);
-+			uint64_t val = eval_literal($2, 0, $1.bits);
-+
-+			$$.data = data_append_integer($1.data, val, $1.bits);
- 		}
--	| celllist DT_LABEL
-+	| arrayprefix DT_CHAR_LITERAL
- 		{
--			$$ = data_add_marker($1, LABEL, $2);
--		}
--	;
-+			uint64_t val = eval_char_literal($2);
- 
--cellval:
--	  DT_LITERAL
-+			$$.data = data_append_integer($1.data, val, $1.bits);
-+		}
-+	| arrayprefix DT_REF
- 		{
--			$$ = eval_literal($1, 0, 32);
-+			uint64_t val = ~0ULL >> (64 - $1.bits);
-+
-+			if ($1.bits == 32)
-+				$1.data = data_add_marker($1.data,
-+							  REF_PHANDLE,
-+							  $2);
-+			else
-+				print_error("References are only allowed in "
-+					    "arrays with 32-bit elements.");
-+
-+			$$.data = data_append_integer($1.data, val, $1.bits);
- 		}
--	| DT_CHAR_LITERAL
-+	| arrayprefix DT_LABEL
- 		{
--			$$ = eval_char_literal($1);
-+			$$.data = data_add_marker($1.data, LABEL, $2);
- 		}
- 	;
- 
-diff --git a/tests/.gitignore b/tests/.gitignore
-index a3e9bd1..9e062c3 100644
---- a/tests/.gitignore
-+++ b/tests/.gitignore
-@@ -40,6 +40,7 @@
- /set_name
- /setprop
- /setprop_inplace
-+/sized_cells
- /string_escapes
- /subnode_offset
- /supernode_atdepth_offset
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index cae8390..215a8c5 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -6,6 +6,7 @@ LIB_TESTS_L = get_mem_rsv \
- 	node_check_compatible node_offset_by_compatible \
- 	get_alias \
- 	char_literal \
-+	sized_cells \
- 	notfound \
- 	setprop_inplace nop_property nop_node \
- 	sw_tree1 \
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index e2c3046..da6f970 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -209,6 +209,9 @@ dtc_tests () {
-     run_dtc_test -I dts -O dtb -o dtc_char_literal.test.dtb char_literal.dts
-     run_test char_literal dtc_char_literal.test.dtb
- 
-+    run_dtc_test -I dts -O dtb -o dtc_sized_cells.test.dtb sized_cells.dts
-+    run_test sized_cells dtc_sized_cells.test.dtb
-+
-     run_dtc_test -I dts -O dtb -o dtc_extra-terminating-null.test.dtb extra-terminating-null.dts
-     run_test extra-terminating-null dtc_extra-terminating-null.test.dtb
- 
-diff --git a/tests/sized_cells.c b/tests/sized_cells.c
-new file mode 100644
-index 0000000..847ec96
---- /dev/null
-+++ b/tests/sized_cells.c
-@@ -0,0 +1,84 @@
-+/*
-+ * libfdt - Flat Device Tree manipulation
-+ *	Testcase for variable sized cells in dtc
-+ * Copyright (C) 2006 David Gibson, IBM Corporation.
-+ * Copyright (C) 2011 The Chromium Authors. All rights reserved.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License
-+ * as published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdint.h>
-+
-+#include <fdt.h>
-+#include <libfdt.h>
-+
-+#include "tests.h"
-+#include "testdata.h"
-+
-+static void check_compare_properties(void *fdt,
-+				     char const *name_one,
-+				     char const *name_two)
-+{
-+	const void *propval;
-+	int proplen;
-+
-+	propval = fdt_getprop(fdt, 0, name_one, &proplen);
-+
-+	if (!propval)
-+		FAIL("fdt_getprop(\"%s\"): %s",
-+		     name_one,
-+		     fdt_strerror(proplen));
-+
-+	check_getprop(fdt, 0, name_two, proplen, propval);
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+	void *fdt;
-+	uint8_t expected_8[6] = {TEST_CHAR1,
-+				 TEST_CHAR2,
-+				 TEST_CHAR3,
-+				 TEST_CHAR4,
-+				 TEST_CHAR5,
-+				 TEST_VALUE_1 >> 24};
-+	uint16_t expected_16[6];
-+	uint32_t expected_32[6];
-+	uint64_t expected_64[6];
-+	int i;
-+
-+	for (i = 0; i < 5; ++i) {
-+		expected_16[i] = cpu_to_fdt16(expected_8[i]);
-+		expected_32[i] = cpu_to_fdt32(expected_8[i]);
-+		expected_64[i] = cpu_to_fdt64(expected_8[i]);
-+	}
-+
-+	expected_16[5] = cpu_to_fdt16(TEST_VALUE_1 >> 16);
-+	expected_32[5] = cpu_to_fdt32(TEST_VALUE_1);
-+	expected_64[5] = cpu_to_fdt64(TEST_ADDR_1);
-+
-+	test_init(argc, argv);
-+	fdt = load_blob_arg(argc, argv);
-+
-+	check_getprop(fdt, 0, "cells-8b", sizeof(expected_8), expected_8);
-+	check_getprop(fdt, 0, "cells-16b", sizeof(expected_16), expected_16);
-+	check_getprop(fdt, 0, "cells-32b", sizeof(expected_32), expected_32);
-+	check_getprop(fdt, 0, "cells-64b", sizeof(expected_64), expected_64);
-+
-+	check_compare_properties(fdt, "cells-one-16b", "cells-one-32b");
-+
-+	PASS();
-+}
-diff --git a/tests/sized_cells.dts b/tests/sized_cells.dts
-new file mode 100644
-index 0000000..efea9f5
---- /dev/null
-+++ b/tests/sized_cells.dts
-@@ -0,0 +1,11 @@
-+/dts-v1/;
-+
-+/ {
-+	cells-8b = /bits/ 8 <'\r' 'b' '\0' '\'' '\xff' 0xde>;
-+	cells-16b = /bits/ 16 <'\r' 'b' '\0' '\'' '\xff' 0xdead>;
-+	cells-32b = /bits/ 32 <'\r' 'b' '\0' '\'' '\xff' 0xdeadbeef>;
-+	cells-64b = /bits/ 64 <'\r' 'b' '\0' '\'' '\xff' 0xdeadbeef00000000>;
-+
-+	cells-one-16b = /bits/ 16 <0x1234 0x5678 0x0 0xffff>;
-+	cells-one-32b = <0x12345678 0x0000ffff>;
-+};
diff -Nru device-tree-compiler-1.4.2/debian/patches/16_fdtdump-rename-from-ftdump.patch device-tree-compiler-1.4.5/debian/patches/16_fdtdump-rename-from-ftdump.patch
--- device-tree-compiler-1.4.2/debian/patches/16_fdtdump-rename-from-ftdump.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/16_fdtdump-rename-from-ftdump.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,438 +0,0 @@
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 25 Oct 2011 21:29:24 +0000 (-0400)
-Subject: fdtdump: rename from ftdump
-X-Git-Url: http://git.jdl.com/gitweb/?p=dtc.git;a=commitdiff_plain;h=8f459c5d72673e1a3a119ac58a7eee56236fca73
-
-fdtdump: rename from ftdump
-
-The freetype package already installs a binary named "ftdump", so the dtc
-package conflicts with that.  So rename the newer dtc tool to "fdtdump".
-This even makes a bit more sense:
-	ftdump: [F]lat device [T]ree [dump]
-	fdtdump: [F]lat [D]evice [T]ree [dump]
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
-
-Index: device-tree-compiler-1.3.0/.gitignore
-===================================================================
---- device-tree-compiler-1.3.0.orig/.gitignore	2012-01-30 15:03:30.095993353 +0100
-+++ device-tree-compiler-1.3.0/.gitignore	2012-01-30 15:03:34.487993309 +0100
-@@ -7,6 +7,6 @@
- lex.yy.c
- *.lex.c
- /dtc
--/ftdump
-+/fdtdump
- /convert-dtsv0
- /version_gen.h
-Index: device-tree-compiler-1.3.0/Documentation/manual.txt
-===================================================================
---- device-tree-compiler-1.3.0.orig/Documentation/manual.txt	2012-01-30 15:03:30.075993336 +0100
-+++ device-tree-compiler-1.3.0/Documentation/manual.txt	2012-01-30 15:03:34.487993309 +0100
-@@ -21,7 +21,7 @@
- 
- IV - Utility Tools
-     1) convert-dtsv0 -- Conversion to Version 1
--    1) ftdump
-+    1) fdtdump
- 
- 
- I - "dtc", the device tree compiler
-@@ -643,10 +643,10 @@
- Comments, empty lines, etc. are preserved.
- 
- 
--2) ftdump -- Flat Tree dumping utility
-+2) fdtdump -- Flat Device Tree dumping utility
- 
--The ftdump program prints a readable version of a flat device tree file.
-+The fdtdump program prints a readable version of a flat device tree file.
- 
--The syntax of the ftdump command line is:
-+The syntax of the fdtdump command line is:
- 
--    ftdump <DTB-file-name>
-+    fdtdump <DTB-file-name>
-Index: device-tree-compiler-1.3.0/Makefile
-===================================================================
---- device-tree-compiler-1.3.0.orig/Makefile	2012-01-30 15:03:30.023993406 +0100
-+++ device-tree-compiler-1.3.0/Makefile	2012-01-30 15:03:34.487993309 +0100
-@@ -109,7 +109,7 @@
- 
- BIN += convert-dtsv0
- BIN += dtc
--BIN += ftdump
-+BIN += fdtdump
- 
- SCRIPTS = dtdiff
- 
-@@ -119,7 +119,7 @@
- ifneq ($(DEPTARGETS),)
- -include $(DTC_OBJS:%.o=%.d)
- -include $(CONVERT_OBJS:%.o=%.d)
---include $(FTDUMP_OBJS:%.o=%.d)
-+-include $(FDTDUMP_OBJS:%.o=%.d)
- endif
- 
- 
-@@ -178,7 +178,7 @@
- 	@$(VECHO) LD $@
- 	$(LINK.c) -o $@ $^
- 
--ftdump:	$(FTDUMP_OBJS)
-+fdtdump:	$(FDTDUMP_OBJS)
- 
- 
- #
-Index: device-tree-compiler-1.3.0/Makefile.utils
-===================================================================
---- device-tree-compiler-1.3.0.orig/Makefile.utils	2012-01-30 15:03:30.043993314 +0100
-+++ device-tree-compiler-1.3.0/Makefile.utils	2012-01-30 15:03:34.491993307 +0100
-@@ -3,8 +3,8 @@
- # be easily embeddable into other systems of Makefiles.
- #
- 
--FTDUMP_SRCS = \
--	ftdump.c \
-+FDTDUMP_SRCS = \
-+	fdtdump.c \
- 	util.c
- 
--FTDUMP_OBJS = $(FTDUMP_SRCS:%.c=%.o)
-+FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o)
-Index: device-tree-compiler-1.3.0/ftdump.c
-===================================================================
---- device-tree-compiler-1.3.0.orig/ftdump.c	2012-01-30 15:03:30.059993370 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,162 +0,0 @@
--/*
-- * ftdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
-- */
--
--#include <stdint.h>
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <ctype.h>
--
--#include <fdt.h>
--#include <libfdt_env.h>
--
--#include "util.h"
--
--#define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
--#define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a))))
--#define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
--
--static void print_data(const char *data, int len)
--{
--	int i;
--	const char *p = data;
--
--	/* no data, don't print */
--	if (len == 0)
--		return;
--
--	if (util_is_printable_string(data, len)) {
--		printf(" = \"%s\"", (const char *)data);
--	} else if ((len % 4) == 0) {
--		printf(" = <");
--		for (i = 0; i < len; i += 4)
--			printf("0x%08x%s", fdt32_to_cpu(GET_CELL(p)),
--			       i < (len - 4) ? " " : "");
--		printf(">");
--	} else {
--		printf(" = [");
--		for (i = 0; i < len; i++)
--			printf("%02x%s", *p++, i < len - 1 ? " " : "");
--		printf("]");
--	}
--}
--
--static void dump_blob(void *blob)
--{
--	struct fdt_header *bph = blob;
--	uint32_t off_mem_rsvmap = fdt32_to_cpu(bph->off_mem_rsvmap);
--	uint32_t off_dt = fdt32_to_cpu(bph->off_dt_struct);
--	uint32_t off_str = fdt32_to_cpu(bph->off_dt_strings);
--	struct fdt_reserve_entry *p_rsvmap =
--		(struct fdt_reserve_entry *)((char *)blob + off_mem_rsvmap);
--	const char *p_struct = (const char *)blob + off_dt;
--	const char *p_strings = (const char *)blob + off_str;
--	uint32_t version = fdt32_to_cpu(bph->version);
--	uint32_t totalsize = fdt32_to_cpu(bph->totalsize);
--	uint32_t tag;
--	const char *p, *s, *t;
--	int depth, sz, shift;
--	int i;
--	uint64_t addr, size;
--
--	depth = 0;
--	shift = 4;
--
--	printf("/dts-v1/;\n");
--	printf("// magic:\t\t0x%x\n", fdt32_to_cpu(bph->magic));
--	printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
--	printf("// off_dt_struct:\t0x%x\n", off_dt);
--	printf("// off_dt_strings:\t0x%x\n", off_str);
--	printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
--	printf("// version:\t\t%d\n", version);
--	printf("// last_comp_version:\t%d\n",
--	       fdt32_to_cpu(bph->last_comp_version));
--	if (version >= 2)
--		printf("// boot_cpuid_phys:\t0x%x\n",
--		       fdt32_to_cpu(bph->boot_cpuid_phys));
--
--	if (version >= 3)
--		printf("// size_dt_strings:\t0x%x\n",
--		       fdt32_to_cpu(bph->size_dt_strings));
--	if (version >= 17)
--		printf("// size_dt_struct:\t0x%x\n",
--		       fdt32_to_cpu(bph->size_dt_struct));
--	printf("\n");
--
--	for (i = 0; ; i++) {
--		addr = fdt64_to_cpu(p_rsvmap[i].address);
--		size = fdt64_to_cpu(p_rsvmap[i].size);
--		if (addr == 0 && size == 0)
--			break;
--
--		printf("/memreserve/ %llx %llx;\n",
--		       (unsigned long long)addr, (unsigned long long)size);
--	}
--
--	p = p_struct;
--	while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
--
--		/* printf("tag: 0x%08x (%d)\n", tag, p - p_struct); */
--
--		if (tag == FDT_BEGIN_NODE) {
--			s = p;
--			p = PALIGN(p + strlen(s) + 1, 4);
--
--			if (*s == '\0')
--				s = "/";
--
--			printf("%*s%s {\n", depth * shift, "", s);
--
--			depth++;
--			continue;
--		}
--
--		if (tag == FDT_END_NODE) {
--			depth--;
--
--			printf("%*s};\n", depth * shift, "");
--			continue;
--		}
--
--		if (tag == FDT_NOP) {
--			printf("%*s// [NOP]\n", depth * shift, "");
--			continue;
--		}
--
--		if (tag != FDT_PROP) {
--			fprintf(stderr, "%*s ** Unknown tag 0x%08x\n", depth * shift, "", tag);
--			break;
--		}
--		sz = fdt32_to_cpu(GET_CELL(p));
--		s = p_strings + fdt32_to_cpu(GET_CELL(p));
--		if (version < 16 && sz >= 8)
--			p = PALIGN(p, 8);
--		t = p;
--
--		p = PALIGN(p + sz, 4);
--
--		printf("%*s%s", depth * shift, "", s);
--		print_data(t, sz);
--		printf(";\n");
--	}
--}
--
--
--int main(int argc, char *argv[])
--{
--	char *buf;
--
--	if (argc < 2) {
--		fprintf(stderr, "supply input filename\n");
--		return 5;
--	}
--
--	buf = utilfdt_read(argv[1]);
--	if (buf)
--		dump_blob(buf);
--	else
--		return 10;
--
--	return 0;
--}
-Index: device-tree-compiler-1.3.0/fdtdump.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ device-tree-compiler-1.3.0/fdtdump.c	2012-01-30 15:04:46.255989457 +0100
-@@ -0,0 +1,162 @@
-+/*
-+ * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
-+ */
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
-+
-+#include <fdt.h>
-+#include <libfdt_env.h>
-+
-+#include "util.h"
-+
-+#define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
-+#define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a))))
-+#define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
-+
-+static void print_data(const char *data, int len)
-+{
-+	int i;
-+	const char *p = data;
-+
-+	/* no data, don't print */
-+	if (len == 0)
-+		return;
-+
-+	if (util_is_printable_string(data, len)) {
-+		printf(" = \"%s\"", (const char *)data);
-+	} else if ((len % 4) == 0) {
-+		printf(" = <");
-+		for (i = 0; i < len; i += 4)
-+			printf("0x%08x%s", fdt32_to_cpu(GET_CELL(p)),
-+			       i < (len - 4) ? " " : "");
-+		printf(">");
-+	} else {
-+		printf(" = [");
-+		for (i = 0; i < len; i++)
-+			printf("%02x%s", *p++, i < len - 1 ? " " : "");
-+		printf("]");
-+	}
-+}
-+
-+static void dump_blob(void *blob)
-+{
-+	struct fdt_header *bph = blob;
-+	uint32_t off_mem_rsvmap = fdt32_to_cpu(bph->off_mem_rsvmap);
-+	uint32_t off_dt = fdt32_to_cpu(bph->off_dt_struct);
-+	uint32_t off_str = fdt32_to_cpu(bph->off_dt_strings);
-+	struct fdt_reserve_entry *p_rsvmap =
-+		(struct fdt_reserve_entry *)((char *)blob + off_mem_rsvmap);
-+	const char *p_struct = (const char *)blob + off_dt;
-+	const char *p_strings = (const char *)blob + off_str;
-+	uint32_t version = fdt32_to_cpu(bph->version);
-+	uint32_t totalsize = fdt32_to_cpu(bph->totalsize);
-+	uint32_t tag;
-+	const char *p, *s, *t;
-+	int depth, sz, shift;
-+	int i;
-+	uint64_t addr, size;
-+
-+	depth = 0;
-+	shift = 4;
-+
-+	printf("/dts-v1/;\n");
-+	printf("// magic:\t\t0x%x\n", fdt32_to_cpu(bph->magic));
-+	printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
-+	printf("// off_dt_struct:\t0x%x\n", off_dt);
-+	printf("// off_dt_strings:\t0x%x\n", off_str);
-+	printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
-+	printf("// version:\t\t%d\n", version);
-+	printf("// last_comp_version:\t%d\n",
-+	       fdt32_to_cpu(bph->last_comp_version));
-+	if (version >= 2)
-+		printf("// boot_cpuid_phys:\t0x%x\n",
-+		       fdt32_to_cpu(bph->boot_cpuid_phys));
-+
-+	if (version >= 3)
-+		printf("// size_dt_strings:\t0x%x\n",
-+		       fdt32_to_cpu(bph->size_dt_strings));
-+	if (version >= 17)
-+		printf("// size_dt_struct:\t0x%x\n",
-+		       fdt32_to_cpu(bph->size_dt_struct));
-+	printf("\n");
-+
-+	for (i = 0; ; i++) {
-+		addr = fdt64_to_cpu(p_rsvmap[i].address);
-+		size = fdt64_to_cpu(p_rsvmap[i].size);
-+		if (addr == 0 && size == 0)
-+			break;
-+
-+		printf("/memreserve/ %llx %llx;\n",
-+		       (unsigned long long)addr, (unsigned long long)size);
-+	}
-+
-+	p = p_struct;
-+	while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
-+
-+		/* printf("tag: 0x%08x (%d)\n", tag, p - p_struct); */
-+
-+		if (tag == FDT_BEGIN_NODE) {
-+			s = p;
-+			p = PALIGN(p + strlen(s) + 1, 4);
-+
-+			if (*s == '\0')
-+				s = "/";
-+
-+			printf("%*s%s {\n", depth * shift, "", s);
-+
-+			depth++;
-+			continue;
-+		}
-+
-+		if (tag == FDT_END_NODE) {
-+			depth--;
-+
-+			printf("%*s};\n", depth * shift, "");
-+			continue;
-+		}
-+
-+		if (tag == FDT_NOP) {
-+			printf("%*s// [NOP]\n", depth * shift, "");
-+			continue;
-+		}
-+
-+		if (tag != FDT_PROP) {
-+			fprintf(stderr, "%*s ** Unknown tag 0x%08x\n", depth * shift, "", tag);
-+			break;
-+		}
-+		sz = fdt32_to_cpu(GET_CELL(p));
-+		s = p_strings + fdt32_to_cpu(GET_CELL(p));
-+		if (version < 16 && sz >= 8)
-+			p = PALIGN(p, 8);
-+		t = p;
-+
-+		p = PALIGN(p + sz, 4);
-+
-+		printf("%*s%s", depth * shift, "", s);
-+		print_data(t, sz);
-+		printf(";\n");
-+	}
-+}
-+
-+
-+int main(int argc, char *argv[])
-+{
-+	char *buf;
-+
-+	if (argc < 2) {
-+		fprintf(stderr, "supply input filename\n");
-+		return 5;
-+	}
-+
-+	buf = utilfdt_read(argv[1]);
-+	if (buf)
-+		dump_blob(buf);
-+	else
-+		return 10;
-+
-+	return 0;
-+}
diff -Nru device-tree-compiler-1.4.2/debian/patches/17_libfdt-Add-support-for-appending-the-values-to-a-exi.patch device-tree-compiler-1.4.5/debian/patches/17_libfdt-Add-support-for-appending-the-values-to-a-exi.patch
--- device-tree-compiler-1.4.2/debian/patches/17_libfdt-Add-support-for-appending-the-values-to-a-exi.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/17_libfdt-Add-support-for-appending-the-values-to-a-exi.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,331 +0,0 @@
-From a31e3ef83bfce62d07695355e5f06cd4d0e44b86 Mon Sep 17 00:00:00 2001
-From: Minghuan Lian <Minghuan.Lian@freescale.com>
-Date: Mon, 5 Dec 2011 12:22:07 +1100
-Subject: [PATCH 2/7] libfdt: Add support for appending the values to a
- existing property
-
-Some properties may contain multiple values, these values may need
-to be added to the property respectively. this patch provides this
-functionality. The main purpose of fdt_append_prop() is to append
-the values to a existing property, or create a new property if it
-dose not exist.
-
-Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- libfdt/fdt_rw.c      |   27 ++++++++++++++
- libfdt/libfdt.h      |   95 ++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/appendprop.dts |    7 ++++
- tests/appendprop1.c  |   70 ++++++++++++++++++++++++++++++++++++
- tests/appendprop2.c  |   64 +++++++++++++++++++++++++++++++++
- 5 files changed, 263 insertions(+), 0 deletions(-)
- create mode 100644 tests/appendprop.dts
- create mode 100644 tests/appendprop1.c
- create mode 100644 tests/appendprop2.c
-
-diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
-index 994037b..24437df 100644
---- a/libfdt/fdt_rw.c
-+++ b/libfdt/fdt_rw.c
-@@ -289,6 +289,33 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
- 	return 0;
- }
- 
-+int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
-+		   const void *val, int len)
-+{
-+	struct fdt_property *prop;
-+	int err, oldlen, newlen;
-+
-+	FDT_RW_CHECK_HEADER(fdt);
-+
-+	prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
-+	if (prop) {
-+		newlen = len + oldlen;
-+		err = _fdt_splice_struct(fdt, prop->data,
-+					 FDT_TAGALIGN(oldlen),
-+					 FDT_TAGALIGN(newlen));
-+		if (err)
-+			return err;
-+		prop->len = cpu_to_fdt32(newlen);
-+		memcpy(prop->data + oldlen, val, len);
-+	} else {
-+		err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
-+		if (err)
-+			return err;
-+		memcpy(prop->data, val, len);
-+	}
-+	return 0;
-+}
-+
- int fdt_delprop(void *fdt, int nodeoffset, const char *name)
- {
- 	struct fdt_property *prop;
-diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index 55f3eb3..060479e 100644
---- a/libfdt/libfdt.h
-+++ b/libfdt/libfdt.h
-@@ -1134,6 +1134,101 @@ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
- 	fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
- 
- /**
-+ * fdt_appendprop - append to or create a property
-+ * @fdt: pointer to the device tree blob
-+ * @nodeoffset: offset of the node whose property to change
-+ * @name: name of the property to append to
-+ * @val: pointer to data to append to the property value
-+ * @len: length of the data to append to the property value
-+ *
-+ * fdt_appendprop() appends the value to the named property in the
-+ * given node, creating the property if it does not already exist.
-+ *
-+ * This function may insert data into the blob, and will therefore
-+ * change the offsets of some existing nodes.
-+ *
-+ * returns:
-+ *	0, on success
-+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
-+ *		contain the new property value
-+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_BADMAGIC,
-+ *	-FDT_ERR_BADVERSION,
-+ *	-FDT_ERR_BADSTATE,
-+ *	-FDT_ERR_BADSTRUCTURE,
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_TRUNCATED, standard meanings
-+ */
-+int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
-+		   const void *val, int len);
-+
-+/**
-+ * fdt_appendprop_cell - append a single cell value to a property
-+ * @fdt: pointer to the device tree blob
-+ * @nodeoffset: offset of the node whose property to change
-+ * @name: name of the property to change
-+ * @val: 32-bit integer value to append to the property (native endian)
-+ *
-+ * fdt_appendprop_cell() appends the given cell value (converting to
-+ * big-endian if necessary) to the value of the named property in the
-+ * given node, or creates a new property with that value if it does
-+ * not already exist.
-+ *
-+ * This function may insert data into the blob, and will therefore
-+ * change the offsets of some existing nodes.
-+ *
-+ * returns:
-+ *	0, on success
-+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
-+ *		contain the new property value
-+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_BADMAGIC,
-+ *	-FDT_ERR_BADVERSION,
-+ *	-FDT_ERR_BADSTATE,
-+ *	-FDT_ERR_BADSTRUCTURE,
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_TRUNCATED, standard meanings
-+ */
-+static inline int fdt_appendprop_cell(void *fdt, int nodeoffset,
-+				      const char *name, uint32_t val)
-+{
-+	val = cpu_to_fdt32(val);
-+	return fdt_appendprop(fdt, nodeoffset, name, &val, sizeof(val));
-+}
-+
-+/**
-+ * fdt_appendprop_string - append a string to a property
-+ * @fdt: pointer to the device tree blob
-+ * @nodeoffset: offset of the node whose property to change
-+ * @name: name of the property to change
-+ * @str: string value to append to the property
-+ *
-+ * fdt_appendprop_string() appends the given string to the value of
-+ * the named property in the given node, or creates a new property
-+ * with that value if it does not already exist.
-+ *
-+ * This function may insert data into the blob, and will therefore
-+ * change the offsets of some existing nodes.
-+ *
-+ * returns:
-+ *	0, on success
-+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
-+ *		contain the new property value
-+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_BADMAGIC,
-+ *	-FDT_ERR_BADVERSION,
-+ *	-FDT_ERR_BADSTATE,
-+ *	-FDT_ERR_BADSTRUCTURE,
-+ *	-FDT_ERR_BADLAYOUT,
-+ *	-FDT_ERR_TRUNCATED, standard meanings
-+ */
-+#define fdt_appendprop_string(fdt, nodeoffset, name, str) \
-+	fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
-+
-+/**
-  * fdt_delprop - delete a property
-  * @fdt: pointer to the device tree blob
-  * @nodeoffset: offset of the node whose property to nop
-diff --git a/tests/appendprop.dts b/tests/appendprop.dts
-new file mode 100644
-index 0000000..6e3a3eb
---- /dev/null
-+++ b/tests/appendprop.dts
-@@ -0,0 +1,7 @@
-+/dts-v1/;
-+
-+/ {
-+	prop-str = "hello world", "nastystring: \a\b\t\n\v\f\r\\\"";
-+	prop-int = <0xdeadbeef 123456789>;
-+	prop-bytes = [00010203040001020304];
-+};
-diff --git a/tests/appendprop1.c b/tests/appendprop1.c
-new file mode 100644
-index 0000000..180d296
---- /dev/null
-+++ b/tests/appendprop1.c
-@@ -0,0 +1,70 @@
-+/*
-+ * libfdt - Flat Device Tree manipulation
-+ *	Testcase for fdt_appendprop()
-+ * Copyright (C) 2006 David Gibson, IBM Corporation.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License
-+ * as published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <stdint.h>
-+
-+#include <fdt.h>
-+#include <libfdt.h>
-+
-+#include "tests.h"
-+#include "testdata.h"
-+
-+#define SPACE		65536
-+
-+#define CHECK(code) \
-+	{ \
-+		err = (code); \
-+		if (err) \
-+			FAIL(#code ": %s", fdt_strerror(err)); \
-+	}
-+
-+int main(int argc, char *argv[])
-+{
-+	void *fdt;
-+	int err;
-+	uint8_t bytes[] = {0x00, 0x01, 0x02, 0x03, 0x04};
-+
-+	test_init(argc, argv);
-+
-+	/* Create an empty tree first */
-+	fdt = xmalloc(SPACE);
-+	CHECK(fdt_create(fdt, SPACE));
-+	CHECK(fdt_finish_reservemap(fdt));
-+	CHECK(fdt_begin_node(fdt, ""));
-+	CHECK(fdt_end_node(fdt));
-+	CHECK(fdt_finish(fdt));
-+
-+	/* Now use appendprop to add properties */
-+	CHECK(fdt_open_into(fdt, fdt, SPACE));
-+
-+	CHECK(fdt_appendprop(fdt, 0, "prop-bytes", bytes, sizeof(bytes)));
-+	CHECK(fdt_appendprop_cell(fdt, 0, "prop-int", TEST_VALUE_1));
-+	CHECK(fdt_appendprop_string(fdt, 0, "prop-str", TEST_STRING_1));
-+
-+	CHECK(fdt_pack(fdt));
-+
-+	save_blob("appendprop1.test.dtb", fdt);
-+
-+	PASS();
-+}
-diff --git a/tests/appendprop2.c b/tests/appendprop2.c
-new file mode 100644
-index 0000000..d651a89
---- /dev/null
-+++ b/tests/appendprop2.c
-@@ -0,0 +1,64 @@
-+/*
-+ * libfdt - Flat Device Tree manipulation
-+ *	Testcase for fdt_appendprop()
-+ * Copyright (C) 2006 David Gibson, IBM Corporation.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License
-+ * as published by the Free Software Foundation; either version 2.1 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <stdint.h>
-+
-+#include <fdt.h>
-+#include <libfdt.h>
-+
-+#include "tests.h"
-+#include "testdata.h"
-+
-+#define SPACE		65536
-+
-+#define CHECK(code) \
-+	{ \
-+		err = (code); \
-+		if (err) \
-+			FAIL(#code ": %s", fdt_strerror(err)); \
-+	}
-+
-+int main(int argc, char *argv[])
-+{
-+	void *fdt, *buf;
-+	int err;
-+	uint8_t bytes[] = {0x00, 0x01, 0x02, 0x03, 0x04};
-+
-+	test_init(argc, argv);
-+	fdt = load_blob_arg(argc, argv);
-+
-+	buf = xmalloc(SPACE);
-+	CHECK(fdt_open_into(fdt, buf, SPACE));
-+	fdt = buf;
-+
-+	CHECK(fdt_appendprop(fdt, 0, "prop-bytes", bytes, sizeof(bytes)));
-+	CHECK(fdt_appendprop_cell(fdt, 0, "prop-int", TEST_VALUE_2));
-+	CHECK(fdt_appendprop_string(fdt, 0, "prop-str", TEST_STRING_2));
-+
-+	CHECK(fdt_pack(fdt));
-+
-+	save_blob("appendprop2.test.dtb", fdt);
-+
-+	PASS();
-+}
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/18_libfdt-Activate-testcase-for-appending-properties.patch device-tree-compiler-1.4.5/debian/patches/18_libfdt-Activate-testcase-for-appending-properties.patch
--- device-tree-compiler-1.4.2/debian/patches/18_libfdt-Activate-testcase-for-appending-properties.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/18_libfdt-Activate-testcase-for-appending-properties.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-From 97b909f852039daaae267a66f5df2c90ed05b586 Mon Sep 17 00:00:00 2001
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Wed, 11 Jan 2012 23:41:32 +1100
-Subject: [PATCH 3/7] libfdt: Activate testcase for appending properties
-
-Commit a31e3ef83bfce62d07695355e5f06cd4d0e44b86 introduced new libfdt
-functions to append to existing properties.  It also included a test case
-for this, but neglected to update the Makefile and run_tests.sh script
-to actually build and execute this testcase.
-
-This patch corrects the oversight.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- tests/Makefile.tests |    1 +
- tests/run_tests.sh   |    4 ++++
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index 215a8c5..3f92074 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -12,6 +12,7 @@ LIB_TESTS_L = get_mem_rsv \
- 	sw_tree1 \
- 	move_and_save mangle-layout nopulate \
- 	open_pack rw_tree1 set_name setprop del_property del_node \
-+	appendprop1 appendprop2 \
- 	string_escapes references path-references phandle_format \
- 	boot-cpuid incbin \
- 	extra-terminating-null \
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index da6f970..c72b9d2 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -178,6 +178,10 @@ libfdt_tests () {
-     run_test rw_tree1
-     tree1_tests rw_tree1.test.dtb
-     tree1_tests_rw rw_tree1.test.dtb
-+    run_test appendprop1
-+    run_test appendprop2 appendprop1.test.dtb
-+    run_dtc_test -I dts -O dtb -o appendprop.test.dtb appendprop.dts
-+    run_test dtbs_equal_ordered appendprop2.test.dtb appendprop.test.dtb
- 
-     for basetree in test_tree1.dtb sw_tree1.test.dtb rw_tree1.test.dtb; do
- 	run_test nopulate $basetree
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/19_dtc-Implement-d-option-to-write-out-a-dependency-fil.patch device-tree-compiler-1.4.5/debian/patches/19_dtc-Implement-d-option-to-write-out-a-dependency-fil.patch
--- device-tree-compiler-1.4.2/debian/patches/19_dtc-Implement-d-option-to-write-out-a-dependency-fil.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/19_dtc-Implement-d-option-to-write-out-a-dependency-fil.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-From 69df9f0de25db1c37970850115cdf48335d41802 Mon Sep 17 00:00:00 2001
-From: Stephen Warren <swarren@nvidia.com>
-Date: Thu, 12 Jan 2012 11:31:00 -0700
-Subject: [PATCH 4/7] dtc: Implement -d option to write out a dependency file
-
-This will allow callers to rebuild .dtb files when any of the /include/d
-.dtsi files are modified, not just the top-level .dts file.
-
-Signed-off-by: Stephen Warren <swarren@nvidia.com>
-Acked-by: David Gibson <david@gibson.dropbear.id.au>
----
- Documentation/manual.txt |    3 +++
- dtc.c                    |   20 +++++++++++++++++++-
- srcpos.c                 |    4 ++++
- srcpos.h                 |    1 +
- tests/dependencies.cmp   |    1 +
- tests/dependencies.dts   |    6 ++++++
- tests/deps_inc1.dtsi     |    1 +
- tests/deps_inc2.dtsi     |    1 +
- tests/run_tests.sh       |    4 ++++
- 9 files changed, 40 insertions(+), 1 deletions(-)
- create mode 100644 tests/dependencies.cmp
- create mode 100644 tests/dependencies.dts
- create mode 100644 tests/deps_inc1.dtsi
- create mode 100644 tests/deps_inc2.dtsi
-
-diff --git a/Documentation/manual.txt b/Documentation/manual.txt
-index 14508f3..989c589 100644
---- a/Documentation/manual.txt
-+++ b/Documentation/manual.txt
-@@ -106,6 +106,9 @@ Options:
-     -O <output_format>
- 	The generated output format, as listed above.
- 
-+    -d <dependency_filename>
-+	Generate a dependency file during compilation.
-+
-     -q
- 	Quiet: -q suppress warnings, -qq errors, -qqq all
- 
-diff --git a/dtc.c b/dtc.c
-index 15d2fc2..7a0c605 100644
---- a/dtc.c
-+++ b/dtc.c
-@@ -71,6 +71,7 @@ static void  __attribute__ ((noreturn)) usage(void)
- 	fprintf(stderr, "\t\t\tasm - assembler source\n");
- 	fprintf(stderr, "\t-V <output version>\n");
- 	fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
-+	fprintf(stderr, "\t-d <output dependency file>\n");
- 	fprintf(stderr, "\t-R <number>\n");
- 	fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
- 	fprintf(stderr, "\t-S <bytes>\n");
-@@ -99,6 +100,7 @@ int main(int argc, char *argv[])
- 	const char *inform = "dts";
- 	const char *outform = "dts";
- 	const char *outname = "-";
-+	const char *depname = NULL;
- 	int force = 0, sort = 0;
- 	const char *arg;
- 	int opt;
-@@ -111,7 +113,7 @@ int main(int argc, char *argv[])
- 	minsize    = 0;
- 	padsize    = 0;
- 
--	while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fqb:vH:s")) != EOF) {
-+	while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fqb:vH:s")) != EOF) {
- 		switch (opt) {
- 		case 'I':
- 			inform = optarg;
-@@ -125,6 +127,9 @@ int main(int argc, char *argv[])
- 		case 'V':
- 			outversion = strtol(optarg, NULL, 0);
- 			break;
-+		case 'd':
-+			depname = optarg;
-+			break;
- 		case 'R':
- 			reservenum = strtol(optarg, NULL, 0);
- 			break;
-@@ -185,6 +190,14 @@ int main(int argc, char *argv[])
- 	fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
- 		inform, outform, arg);
- 
-+	if (depname) {
-+		depfile = fopen(depname, "w");
-+		if (!depfile)
-+			die("Couldn't open dependency file %s: %s\n", depname,
-+			    strerror(errno));
-+		fprintf(depfile, "%s:", outname);
-+	}
-+
- 	if (streq(inform, "dts"))
- 		bi = dt_from_source(arg);
- 	else if (streq(inform, "fs"))
-@@ -194,6 +207,11 @@ int main(int argc, char *argv[])
- 	else
- 		die("Unknown input format \"%s\"\n", inform);
- 
-+	if (depfile) {
-+		fputc('\n', depfile);
-+		fclose(depfile);
-+	}
-+
- 	if (cmdline_boot_cpuid != -1)
- 		bi->boot_cpuid_phys = cmdline_boot_cpuid;
- 
-diff --git a/srcpos.c b/srcpos.c
-index 2dbc874..36a38e9 100644
---- a/srcpos.c
-+++ b/srcpos.c
-@@ -40,6 +40,7 @@ static char *dirname(const char *path)
- 	return NULL;
- }
- 
-+FILE *depfile; /* = NULL */
- struct srcfile_state *current_srcfile; /* = NULL */
- 
- /* Detect infinite include recursion. */
-@@ -67,6 +68,9 @@ FILE *srcfile_relative_open(const char *fname, char **fullnamep)
- 			    strerror(errno));
- 	}
- 
-+	if (depfile)
-+		fprintf(depfile, " %s", fullname);
-+
- 	if (fullnamep)
- 		*fullnamep = fullname;
- 	else
-diff --git a/srcpos.h b/srcpos.h
-index bd7966e..ce980ca 100644
---- a/srcpos.h
-+++ b/srcpos.h
-@@ -30,6 +30,7 @@ struct srcfile_state {
- 	struct srcfile_state *prev;
- };
- 
-+extern FILE *depfile; /* = NULL */
- extern struct srcfile_state *current_srcfile; /* = NULL */
- 
- FILE *srcfile_relative_open(const char *fname, char **fullnamep);
-diff --git a/tests/dependencies.cmp b/tests/dependencies.cmp
-new file mode 100644
-index 0000000..bcd9432
---- /dev/null
-+++ b/tests/dependencies.cmp
-@@ -0,0 +1 @@
-+dependencies.test.dtb: dependencies.dts deps_inc1.dtsi deps_inc2.dtsi
-diff --git a/tests/dependencies.dts b/tests/dependencies.dts
-new file mode 100644
-index 0000000..2cfe31b
---- /dev/null
-+++ b/tests/dependencies.dts
-@@ -0,0 +1,6 @@
-+/dts-v1/;
-+
-+/include/ "deps_inc1.dtsi"
-+
-+/ {
-+};
-diff --git a/tests/deps_inc1.dtsi b/tests/deps_inc1.dtsi
-new file mode 100644
-index 0000000..5c607dc
---- /dev/null
-+++ b/tests/deps_inc1.dtsi
-@@ -0,0 +1 @@
-+/include/ "deps_inc2.dtsi"
-diff --git a/tests/deps_inc2.dtsi b/tests/deps_inc2.dtsi
-new file mode 100644
-index 0000000..710cecc
---- /dev/null
-+++ b/tests/deps_inc2.dtsi
-@@ -0,0 +1 @@
-+/* Empty */
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index c72b9d2..e42154b 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -357,6 +357,10 @@ dtc_tests () {
-     run_sh_test dtc-fatal.sh -I dts -O dtb nosuchfile.dts
-     run_sh_test dtc-fatal.sh -I dtb -O dtb nosuchfile.dtb
-     run_sh_test dtc-fatal.sh -I fs -O dtb nosuchfile
-+
-+    # Dependencies
-+    run_dtc_test -I dts -O dtb -o dependencies.test.dtb -d dependencies.test.d dependencies.dts
-+    run_wrap_test cmp dependencies.test.d dependencies.cmp
- }
- 
- cmp_tests () {
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/20_Add-fdtget-utility-to-read-property-values-from-a-de.patch device-tree-compiler-1.4.5/debian/patches/20_Add-fdtget-utility-to-read-property-values-from-a-de.patch
--- device-tree-compiler-1.4.2/debian/patches/20_Add-fdtget-utility-to-read-property-values-from-a-de.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/20_Add-fdtget-utility-to-read-property-values-from-a-de.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,486 +0,0 @@
-From 68d057f20d7c3a93b441d2892c4749392bc83b45 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Sat, 21 Jan 2012 10:14:47 -0800
-Subject: [PATCH 5/7] Add fdtget utility to read property values from a device
- tree
-
-This simply utility makes it easy for scripts to read values from the device
-tree. It is written in C and uses the same libfdt as the rest of the dtc
-package.
-
-What is it for:
-- Reading fdt values from scripts
-- Extracting fdt information within build systems
-- Looking at particular values without having to dump the entire tree
-
-To use it, specify the fdt binary file on command line followed by a list of
-node, property pairs. The utility then looks up each node, finds the property
-and displays the value.
-
-Each value is printed on a new line.
-
-fdtget tries to guess the type of each property based on its contents. This
-is not always reliable, so you can use the -t option to force fdtget to decode
-the value as a string, or byte, etc.
-
-To read from stdin, use - as the file.
-
-Usage:
-	fdtget <options> <dt file> [<node> <property>]...
-Options:
-	-t <type>	Type of data
-	-h		Print this help
-
-<type>	s=string, i=int, u=unsigned, x=hex
-	Optional modifier prefix:
-		hh or b=byte, h=2 byte, l=4 byte (default)
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- .gitignore              |    1 +
- Makefile                |    4 +
- Makefile.utils          |    7 ++
- fdtget.c                |  226 +++++++++++++++++++++++++++++++++++++++++++++++
- tests/fdtget-runtest.sh |   35 +++++++
- tests/run_tests.sh      |   43 +++++++++-
- tests/tests.sh          |    1 +
- util.h                  |   10 ++
- 8 files changed, 326 insertions(+), 1 deletions(-)
- create mode 100644 fdtget.c
- create mode 100755 tests/fdtget-runtest.sh
-
-diff --git a/.gitignore b/.gitignore
-index 74714cd..2d82b71 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -10,3 +10,4 @@ lex.yy.c
- /fdtdump
- /convert-dtsv0
- /version_gen.h
-+/fdtget
-diff --git a/Makefile b/Makefile
-index 4582f5d..a54a209 100644
---- a/Makefile
-+++ b/Makefile
-@@ -110,6 +110,7 @@ include Makefile.utils
- BIN += convert-dtsv0
- BIN += dtc
- BIN += fdtdump
-+BIN += fdtget
- 
- SCRIPTS = dtdiff
- 
-@@ -120,6 +121,7 @@ ifneq ($(DEPTARGETS),)
- -include $(DTC_OBJS:%.o=%.d)
- -include $(CONVERT_OBJS:%.o=%.d)
- -include $(FDTDUMP_OBJS:%.o=%.d)
-+-include $(FDTGET_OBJS:%.o=%.d)
- endif
- 
- 
-@@ -180,6 +182,8 @@ convert-dtsv0: $(CONVERT_OBJS)
- 
- fdtdump:	$(FDTDUMP_OBJS)
- 
-+fdtget:	$(FDTGET_OBJS) $(LIBFDT_archive)
-+
- 
- #
- # Testsuite rules
-diff --git a/Makefile.utils b/Makefile.utils
-index fae5b00..38efa3c 100644
---- a/Makefile.utils
-+++ b/Makefile.utils
-@@ -8,3 +8,10 @@ FDTDUMP_SRCS = \
- 	util.c
- 
- FDTDUMP_OBJS = $(FDTDUMP_SRCS:%.c=%.o)
-+
-+
-+FDTGET_SRCS = \
-+	fdtget.c \
-+	util.c
-+
-+FDTGET_OBJS = $(FDTGET_SRCS:%.c=%.o)
-diff --git a/fdtget.c b/fdtget.c
-new file mode 100644
-index 0000000..48ab615
---- /dev/null
-+++ b/fdtget.c
-@@ -0,0 +1,226 @@
-+/*
-+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <ctype.h>
-+#include <getopt.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <libfdt.h>
-+
-+#include "util.h"
-+
-+/* Holds information which controls our output and options */
-+struct display_info {
-+	int type;		/* data type (s/i/u/x or 0 for default) */
-+	int size;		/* data size (1/2/4) */
-+};
-+
-+static void report_error(const char *where, int err)
-+{
-+	fprintf(stderr, "Error at '%s': %s\n", where, fdt_strerror(err));
-+}
-+
-+/**
-+ * Displays data of a given length according to selected options
-+ *
-+ * If a specific data type is provided in disp, then this is used. Otherwise
-+ * we try to guess the data type / size from the contents.
-+ *
-+ * @param disp		Display information / options
-+ * @param data		Data to display
-+ * @param len		Maximum length of buffer
-+ * @return 0 if ok, -1 if data does not match format
-+ */
-+static int show_data(struct display_info *disp, const char *data, int len)
-+{
-+	int i, size;
-+	const uint8_t *p = (const uint8_t *)data;
-+	const char *s;
-+	int value;
-+	int is_string;
-+	char fmt[3];
-+
-+	/* no data, don't print */
-+	if (len == 0)
-+		return 0;
-+
-+	is_string = (disp->type) == 's' ||
-+		(!disp->type && util_is_printable_string(data, len));
-+	if (is_string) {
-+		if (data[len - 1] != '\0') {
-+			fprintf(stderr, "Unterminated string\n");
-+			return -1;
-+		}
-+		for (s = data; s - data < len; s += strlen(s) + 1) {
-+			if (s != data)
-+				printf(" ");
-+			printf("%s", (const char *)s);
-+		}
-+		return 0;
-+	}
-+	size = disp->size;
-+	if (size == -1)
-+		size = (len % 4) == 0 ? 4 : 1;
-+	else if (len % size) {
-+		fprintf(stderr, "Property length must be a multiple of "
-+				"selected data size\n");
-+		return -1;
-+	}
-+	fmt[0] = '%';
-+	fmt[1] = disp->type ? disp->type : 'd';
-+	fmt[2] = '\0';
-+	for (i = 0; i < len; i += size, p += size) {
-+		if (i)
-+			printf(" ");
-+		value = size == 4 ? fdt32_to_cpu(*(const uint32_t *)p) :
-+			size == 2 ? (*p << 8) | p[1] : *p;
-+		printf(fmt, value);
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * Show the data for a given node (and perhaps property) according to the
-+ * display option provided.
-+ *
-+ * @param blob		FDT blob
-+ * @param disp		Display information / options
-+ * @param node		Node to display
-+ * @param property	Name of property to display, or NULL if none
-+ * @return 0 if ok, -ve on error
-+ */
-+static int show_data_for_item(const void *blob, struct display_info *disp,
-+		int node, const char *property)
-+{
-+	const void *value = NULL;
-+	int len, err = 0;
-+
-+	value = fdt_getprop(blob, node, property, &len);
-+	if (value) {
-+		if (show_data(disp, value, len))
-+			err = -1;
-+		else
-+			printf("\n");
-+	} else {
-+		report_error(property, len);
-+		err = -1;
-+	}
-+	return err;
-+}
-+
-+/**
-+ * Run the main fdtget operation, given a filename and valid arguments
-+ *
-+ * @param disp		Display information / options
-+ * @param filename	Filename of blob file
-+ * @param arg		List of arguments to process
-+ * @param arg_count	Number of arguments
-+ * @param return 0 if ok, -ve on error
-+ */
-+static int do_fdtget(struct display_info *disp, const char *filename,
-+		     char **arg, int arg_count)
-+{
-+	char *blob;
-+	int i, node;
-+
-+	blob = utilfdt_read(filename);
-+	if (!blob)
-+		return -1;
-+
-+	for (i = 0; i + 2 <= arg_count; i += 2) {
-+		node = fdt_path_offset(blob, arg[0]);
-+		if (node < 0) {
-+			report_error(arg[0], node);
-+			return -1;
-+		}
-+
-+		if (show_data_for_item(blob, disp, node, arg[1]))
-+			return -1;
-+	}
-+	return 0;
-+}
-+
-+static const char *usage_msg =
-+	"fdtget - read values from device tree\n"
-+	"\n"
-+	"Each value is printed on a new line.\n\n"
-+	"Usage:\n"
-+	"	fdtget <options> <dt file> [<node> <property>]...\n"
-+	"Options:\n"
-+	"\t-t <type>\tType of data\n"
-+	"\t-h\t\tPrint this help\n\n"
-+	USAGE_TYPE_MSG;
-+
-+static void usage(const char *msg)
-+{
-+	if (msg)
-+		fprintf(stderr, "Error: %s\n\n", msg);
-+
-+	fprintf(stderr, "%s", usage_msg);
-+	exit(2);
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+	char *filename = NULL;
-+	struct display_info disp;
-+
-+	/* set defaults */
-+	memset(&disp, '\0', sizeof(disp));
-+	disp.size = -1;
-+	for (;;) {
-+		int c = getopt(argc, argv, "ht:");
-+		if (c == -1)
-+			break;
-+
-+		switch (c) {
-+		case 'h':
-+		case '?':
-+			usage(NULL);
-+
-+		case 't':
-+			if (utilfdt_decode_type(optarg, &disp.type,
-+					&disp.size))
-+				usage("Invalid type string");
-+			break;
-+		}
-+	}
-+
-+	if (optind < argc)
-+		filename = argv[optind++];
-+	if (!filename)
-+		usage("Missing filename");
-+
-+	argv += optind;
-+	argc -= optind;
-+
-+	/* Allow no arguments, and silently succeed */
-+	if (!argc)
-+		return 0;
-+
-+	/* Check for node, property arguments */
-+	if (argc % 2)
-+		usage("Must have an even number of arguments");
-+
-+	if (do_fdtget(&disp, filename, argv, argc))
-+		return 1;
-+	return 0;
-+}
-diff --git a/tests/fdtget-runtest.sh b/tests/fdtget-runtest.sh
-new file mode 100755
-index 0000000..f38184f
---- /dev/null
-+++ b/tests/fdtget-runtest.sh
-@@ -0,0 +1,35 @@
-+#! /bin/sh
-+
-+. ./tests.sh
-+
-+LOG="tmp.log.$$"
-+EXPECT="tmp.expect.$$"
-+
-+rm -f $TMPFILE $LOG
-+
-+expect="$1"
-+echo "$expect" >$EXPECT
-+shift
-+
-+verbose_run_log "$LOG" $VALGRIND "$DTGET" "$@"
-+ret="$?"
-+
-+if [ "$ret" -ne 0 -a "$expect" = "ERR" ]; then
-+	PASS
-+fi
-+
-+if [ "$ret" -gt 127 ]; then
-+    signame=$(kill -l $[ret - 128])
-+    FAIL "Killed by SIG$signame"
-+fi
-+
-+diff $EXPECT $LOG
-+ret="$?"
-+
-+rm -f $LOG $EXPECT
-+
-+if [ "$ret" -eq 0 ]; then
-+	PASS
-+else
-+	FAIL
-+fi
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index e42154b..e6184df 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -83,6 +83,13 @@ asm_to_so_test () {
-     run_wrap_test asm_to_so "$@"
- }
- 
-+run_fdtget_test () {
-+    # run_fdtget_test name expected_output dtb_file args...
-+    echo -n "$1:	"
-+    shift
-+    base_run_test sh fdtget-runtest.sh "$@"
-+}
-+
- tree1_tests () {
-     TREE=$1
- 
-@@ -402,6 +409,37 @@ dtbs_equal_tests () {
-     cmp_tests test_tree1.dtb $WRONG_TREE1
- }
- 
-+fdtget_tests () {
-+    file=label01.dtb
-+    $DTC -O dtb -o $file ${file%.dtb}.dts 2>/dev/null
-+
-+    # run_fdtget_test <test-name> <expected-result> <args>...
-+    run_fdtget_test "Simple string" "MyBoardName" $file / model
-+    run_fdtget_test "Multiple string i" "77 121 66 111 \
-+97 114 100 78 97 109 101 0 77 121 66 111 97 114 100 70 97 109 105 \
-+108 121 78 97 109 101 0" $file / compatible
-+    run_fdtget_test "Multiple string s" "MyBoardName MyBoardFamilyName" \
-+	-t s $file / compatible
-+    run_fdtget_test "Integer" "32768" $file /cpus/PowerPC,970@1 d-cache-size
-+    run_fdtget_test "Integer hex" "8000" -tx $file \
-+	/cpus/PowerPC,970@1 d-cache-size
-+    run_fdtget_test "Integer list" "61 62 63 0" -tbx $file \
-+	/randomnode tricky1
-+    run_fdtget_test "Byte list short" "a b c d de ea ad be ef" -tbx \
-+	$file /randomnode blob
-+
-+    # Here the property size is not a multiple of 4 bytes, so it should fail
-+    run_fdtget_test "Integer list invalid" ERR -tlx \
-+	$file /randomnode mixed
-+    run_fdtget_test "Integer list halfword" "6162 6300 1234 0 a 0 b 0 c" -thx \
-+	$file /randomnode mixed
-+    run_fdtget_test "Integer list byte" \
-+	"61 62 63 0 12 34 0 0 0 a 0 0 0 b 0 0 0 c" -thhx \
-+	$file /randomnode mixed
-+    run_fdtget_test "Missing property" ERR -ts \
-+	$file /randomnode doctor-who
-+}
-+
- utilfdt_tests () {
-     run_test utilfdt_test
- }
-@@ -421,7 +459,7 @@ while getopts "vt:m" ARG ; do
- done
- 
- if [ -z "$TESTSETS" ]; then
--    TESTSETS="libfdt utilfdt dtc dtbs_equal"
-+    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget"
- fi
- 
- # Make sure we don't have stale blobs lying around
-@@ -441,6 +479,9 @@ for set in $TESTSETS; do
- 	"dtbs_equal")
- 	    dtbs_equal_tests
- 	    ;;
-+	"fdtget")
-+	    fdtget_tests
-+	    ;;
-     esac
- done
- 
-diff --git a/tests/tests.sh b/tests/tests.sh
-index 30ffead..d9a0524 100644
---- a/tests/tests.sh
-+++ b/tests/tests.sh
-@@ -11,6 +11,7 @@ FAIL () {
- }
- 
- DTC=../dtc
-+DTGET=../fdtget
- 
- verbose_run () {
-     if [ -z "$QUIET_TEST" ]; then
-diff --git a/util.h b/util.h
-index 730918e..c8eb45d 100644
---- a/util.h
-+++ b/util.h
-@@ -140,4 +140,14 @@ int utilfdt_write_err(const char *filename, const void *blob);
-  */
- int utilfdt_decode_type(const char *fmt, int *type, int *size);
- 
-+/*
-+ * This is a usage message fragment for the -t option. It is the format
-+ * supported by utilfdt_decode_type.
-+ */
-+
-+#define USAGE_TYPE_MSG \
-+	"<type>\ts=string, i=int, u=unsigned, x=hex\n" \
-+	"\tOptional modifier prefix:\n" \
-+	"\t\thh or b=byte, h=2 byte, l=4 byte (default)\n";
-+
- #endif /* _UTIL_H */
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/21_Add-fdtput-utility-to-write-property-values-to-a-dev.patch device-tree-compiler-1.4.5/debian/patches/21_Add-fdtput-utility-to-write-property-values-to-a-dev.patch
--- device-tree-compiler-1.4.2/debian/patches/21_Add-fdtput-utility-to-write-property-values-to-a-dev.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/21_Add-fdtput-utility-to-write-property-values-to-a-dev.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,534 +0,0 @@
-From 1ede50c3559bbfca79fadcbfd8acb9388f4aac87 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Sat, 21 Jan 2012 10:14:48 -0800
-Subject: [PATCH 6/7] Add fdtput utility to write property values to a device
- tree
-
-This simple utility allows writing of values into a device tree from the
-command line. It aimes to be the opposite of fdtget.
-
-What is it for:
-- Updating fdt values when a binary blob already exists
-   (even though source may be available it might be easier to use this
-    utility rather than sed, etc.)
-- Writing machine-specific fdt values within a build system
-
-To use it, specify the fdt binary file on command line followed by the node
-and property to set. Then, provide a list of values to put into that
-property. Often there will be just one, but fdtput also supports arrays and
-string lists.
-
-fdtput does not try to guess the type of the property based on looking at
-the arguments. Instead it always assumes that an integer is provided. To
-indicate that you want to write a string, use -ts. You can also provide
-hex values with -tx.
-
-The command line arguments are joined together into a single value. For
-strings, a nul terminator is placed between each string when it is packed
-into the property. To avoid this, pass the string as a single argument.
-
-Usage:
-	fdtput <options> <dt file> <<node> <property> [<value>...]
-Options:
-	-t <type>	Type of data
-	-v		Verbose: display each value decoded from command line
-	-h		Print this help
-
-<type>	s=string, i=int, u=unsigned, x=hex
-	Optional modifier prefix:
-		hh or b=byte, h=2 byte, l=4 byte (default)
-
-To read from stdin and write to stdout, use - as the file. So you can do:
-
-cat somefile.dtb | fdtput -ts - /node prop "My string value" > newfile.dtb
-
-This commit also adds basic tests to verify the major features.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- .gitignore              |    1 +
- Makefile                |    4 +
- Makefile.utils          |    7 ++
- fdtput.c                |  235 +++++++++++++++++++++++++++++++++++++++++++++++
- tests/fdtput-runtest.sh |   55 +++++++++++
- tests/run_tests.sh      |   73 ++++++++++++++-
- tests/tests.sh          |    1 +
- 7 files changed, 375 insertions(+), 1 deletions(-)
- create mode 100644 fdtput.c
- create mode 100644 tests/fdtput-runtest.sh
-
-diff --git a/.gitignore b/.gitignore
-index 2d82b71..5074980 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -11,3 +11,4 @@ lex.yy.c
- /convert-dtsv0
- /version_gen.h
- /fdtget
-+/fdtput
-diff --git a/Makefile b/Makefile
-index a54a209..510caa6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -111,6 +111,7 @@ BIN += convert-dtsv0
- BIN += dtc
- BIN += fdtdump
- BIN += fdtget
-+BIN += fdtput
- 
- SCRIPTS = dtdiff
- 
-@@ -122,6 +123,7 @@ ifneq ($(DEPTARGETS),)
- -include $(CONVERT_OBJS:%.o=%.d)
- -include $(FDTDUMP_OBJS:%.o=%.d)
- -include $(FDTGET_OBJS:%.o=%.d)
-+-include $(FDTPUT_OBJS:%.o=%.d)
- endif
- 
- 
-@@ -184,6 +186,8 @@ fdtdump:	$(FDTDUMP_OBJS)
- 
- fdtget:	$(FDTGET_OBJS) $(LIBFDT_archive)
- 
-+fdtput:	$(FDTPUT_OBJS) $(LIBFDT_archive)
-+
- 
- #
- # Testsuite rules
-diff --git a/Makefile.utils b/Makefile.utils
-index 38efa3c..48ece49 100644
---- a/Makefile.utils
-+++ b/Makefile.utils
-@@ -15,3 +15,10 @@ FDTGET_SRCS = \
- 	util.c
- 
- FDTGET_OBJS = $(FDTGET_SRCS:%.c=%.o)
-+
-+
-+FDTPUT_SRCS = \
-+	fdtput.c \
-+	util.c
-+
-+FDTPUT_OBJS = $(FDTPUT_SRCS:%.c=%.o)
-diff --git a/fdtput.c b/fdtput.c
-new file mode 100644
-index 0000000..f6ebd24
---- /dev/null
-+++ b/fdtput.c
-@@ -0,0 +1,235 @@
-+/*
-+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <assert.h>
-+#include <ctype.h>
-+#include <getopt.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <libfdt.h>
-+
-+#include "util.h"
-+
-+struct display_info {
-+	int type;		/* data type (s/i/u/x or 0 for default) */
-+	int size;		/* data size (1/2/4) */
-+	int verbose;		/* verbose output */
-+};
-+
-+static void report_error(const char *where, int err)
-+{
-+	fprintf(stderr, "Error at '%s': %s\n", where, fdt_strerror(err));
-+}
-+
-+/**
-+ * Encode a series of arguments in a property value.
-+ *
-+ * @param disp		Display information / options
-+ * @param arg		List of arguments from command line
-+ * @param arg_count	Number of arguments (may be 0)
-+ * @param valuep	Returns buffer containing value
-+ * @param *value_len	Returns length of value encoded
-+ */
-+static int encode_value(struct display_info *disp, char **arg, int arg_count,
-+			char **valuep, int *value_len)
-+{
-+	char *value = NULL;	/* holding area for value */
-+	int value_size = 0;	/* size of holding area */
-+	char *ptr;		/* pointer to current value position */
-+	int len;		/* length of this cell/string/byte */
-+	int ival;
-+	int upto;	/* the number of bytes we have written to buf */
-+	char fmt[3];
-+
-+	upto = 0;
-+
-+	if (disp->verbose)
-+		fprintf(stderr, "Decoding value:\n");
-+
-+	fmt[0] = '%';
-+	fmt[1] = disp->type ? disp->type : 'd';
-+	fmt[2] = '\0';
-+	for (; arg_count > 0; arg++, arg_count--, upto += len) {
-+		/* assume integer unless told otherwise */
-+		if (disp->type == 's')
-+			len = strlen(*arg) + 1;
-+		else
-+			len = disp->size == -1 ? 4 : disp->size;
-+
-+		/* enlarge our value buffer by a suitable margin if needed */
-+		if (upto + len > value_size) {
-+			value_size = (upto + len) + 500;
-+			value = realloc(value, value_size);
-+			if (!value) {
-+				fprintf(stderr, "Out of mmory: cannot alloc "
-+					"%d bytes\n", value_size);
-+				return -1;
-+			}
-+		}
-+
-+		ptr = value + upto;
-+		if (disp->type == 's') {
-+			memcpy(ptr, *arg, len);
-+			if (disp->verbose)
-+				fprintf(stderr, "\tstring: '%s'\n", ptr);
-+		} else {
-+			int *iptr = (int *)ptr;
-+			sscanf(*arg, fmt, &ival);
-+			if (len == 4)
-+				*iptr = cpu_to_fdt32(ival);
-+			else
-+				*ptr = (uint8_t)ival;
-+			if (disp->verbose) {
-+				fprintf(stderr, "\t%s: %d\n",
-+					disp->size == 1 ? "byte" :
-+					disp->size == 2 ? "short" : "int",
-+					ival);
-+			}
-+		}
-+	}
-+	*value_len = upto;
-+	*valuep = value;
-+	if (disp->verbose)
-+		fprintf(stderr, "Value size %d\n", upto);
-+	return 0;
-+}
-+
-+static int store_key_value(void *blob, const char *node_name,
-+		const char *property, const char *buf, int len)
-+{
-+	int node;
-+	int err;
-+
-+	node = fdt_path_offset(blob, node_name);
-+	if (node < 0) {
-+		report_error(node_name, node);
-+		return -1;
-+	}
-+
-+	err = fdt_setprop(blob, node, property, buf, len);
-+	if (err) {
-+		report_error(property, err);
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static int do_fdtput(struct display_info *disp, const char *filename,
-+		    char **arg, int arg_count)
-+{
-+	char *value;
-+	char *blob;
-+	int len, ret = 0;
-+
-+	blob = utilfdt_read(filename);
-+	if (!blob)
-+		return -1;
-+
-+	/* convert the arguments into a single binary value, then store */
-+	assert(arg_count >= 2);
-+	if (encode_value(disp, arg + 2, arg_count - 2, &value, &len) ||
-+		store_key_value(blob, *arg, arg[1], value, len))
-+		ret = -1;
-+
-+	if (!ret)
-+		ret = utilfdt_write(filename, blob);
-+
-+	free(blob);
-+	return ret;
-+}
-+
-+static const char *usage_msg =
-+	"fdtput - write a property value to a device tree\n"
-+	"\n"
-+	"The command line arguments are joined together into a single value.\n"
-+	"\n"
-+	"Usage:\n"
-+	"	fdtput <options> <dt file> <<node> <property> [<value>...]\n"
-+	"Options:\n"
-+	"\t-t <type>\tType of data\n"
-+	"\t-v\t\tVerbose: display each value decoded from command line\n"
-+	"\t-h\t\tPrint this help\n\n"
-+	USAGE_TYPE_MSG;
-+
-+static void usage(const char *msg)
-+{
-+	if (msg)
-+		fprintf(stderr, "Error: %s\n\n", msg);
-+
-+	fprintf(stderr, "%s", usage_msg);
-+	exit(2);
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+	struct display_info disp;
-+	char *filename = NULL;
-+
-+	memset(&disp, '\0', sizeof(disp));
-+	disp.size = -1;
-+	for (;;) {
-+		int c = getopt(argc, argv, "ht:v");
-+		if (c == -1)
-+			break;
-+
-+		/*
-+		 * TODO: add options to:
-+		 * - delete property
-+		 * - delete node (optionally recursively)
-+		 * - rename node
-+		 * - pack fdt before writing
-+		 * - set amount of free space when writing
-+		 * - expand fdt if value doesn't fit
-+		 */
-+		switch (c) {
-+		case 'h':
-+		case '?':
-+			usage(NULL);
-+
-+		case 't':
-+			if (utilfdt_decode_type(optarg, &disp.type,
-+					&disp.size))
-+				usage("Invalid type string");
-+			break;
-+
-+		case 'v':
-+			disp.verbose = 1;
-+			break;
-+		}
-+	}
-+
-+	if (optind < argc)
-+		filename = argv[optind++];
-+	if (!filename)
-+		usage("Missing filename");
-+
-+	argv += optind;
-+	argc -= optind;
-+
-+	if (argc < 1)
-+		usage("Missing node");
-+	if (argc < 2)
-+		usage("Missing property");
-+
-+	if (do_fdtput(&disp, filename, argv, argc))
-+		return 1;
-+	return 0;
-+}
-diff --git a/tests/fdtput-runtest.sh b/tests/fdtput-runtest.sh
-new file mode 100644
-index 0000000..ea51569
---- /dev/null
-+++ b/tests/fdtput-runtest.sh
-@@ -0,0 +1,55 @@
-+#! /bin/sh
-+
-+# Run script for fdtput tests
-+# We run fdtput to update the device tree, thn fdtget to check it
-+
-+# Usage
-+#    fdtput-runtest.sh name expected_output dtb_file node property flags value
-+
-+. ./tests.sh
-+
-+LOG="tmp.log.$$"
-+EXPECT="tmp.expect.$$"
-+
-+rm -f $TMPFILE $LOG
-+
-+expect="$1"
-+echo "$expect" >$EXPECT
-+dtb="$2"
-+node="$3"
-+property="$4"
-+flags="$5"
-+shift 5
-+value="$@"
-+
-+# First run fdtput
-+verbose_run $VALGRIND "$DTPUT" "$dtb" "$node" "$property" $value $flags
-+ret="$?"
-+
-+if [ "$ret" -ne 0 -a "$expect" = "ERR" ]; then
-+	PASS
-+fi
-+if [ "$ret" -gt 127 ]; then
-+    signame=$(kill -l $[ret - 128])
-+    FAIL "Killed by SIG$signame"
-+fi
-+
-+# Now fdtget to read the value
-+verbose_run_log "$LOG" $VALGRIND "$DTGET" "$dtb" "$node" "$property" $flags
-+ret="$?"
-+
-+if [ "$ret" -gt 127 ]; then
-+    signame=$(kill -l $[ret - 128])
-+    FAIL "Killed by SIG$signame"
-+fi
-+
-+diff $EXPECT $LOG
-+ret="$?"
-+
-+rm -f $LOG $EXPECT
-+
-+if [ "$ret" -eq 0 ]; then
-+	PASS
-+else
-+	FAIL
-+fi
-diff --git a/tests/run_tests.sh b/tests/run_tests.sh
-index e6184df..2650559 100755
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -90,6 +90,21 @@ run_fdtget_test () {
-     base_run_test sh fdtget-runtest.sh "$@"
- }
- 
-+run_fdtput_test () {
-+    # run_fdtput_test name expected_output dtb_file node property flags value...
-+    echo -n "$1:	"
-+    shift
-+    output="$1"
-+    dtb="$2"
-+    node="$3"
-+    property="$4"
-+    flags="$5"
-+    shift 5
-+    base_run_test sh fdtput-runtest.sh "$output" "$dtb" "$node" "$property" \
-+		"$flags" $@
-+#     base_run_test sh fdtput-runtest.sh "$@"
-+}
-+
- tree1_tests () {
-     TREE=$1
- 
-@@ -440,6 +455,59 @@ fdtget_tests () {
- 	$file /randomnode doctor-who
- }
- 
-+fdtput_tests () {
-+    file=label01.dtb
-+    src=label01.dts
-+
-+    # Create some test files containing useful strings
-+    base=tmp.test0
-+    file1=tmp.test1
-+    file2=tmp.test2
-+    bigfile1=tmp.test3
-+    bigfile2=tmp.test4
-+
-+    # Filter out anything the shell might not like
-+    cat $src | tr -d "'\"\n\;/\.\*{}\-" | tr -s "[:blank:]" " " >$base
-+
-+    # Make two small files
-+    head -5 $base >$file1
-+    cat $file1 | tr a-z A-Z | cut -c10-30 | sort -r >$file2
-+
-+    # and two larger ones
-+    cat $base > $bigfile1
-+    tac $base | tr a-z A-Z | sort -r >$bigfile2
-+
-+    # Allow just enough space for both file1 and file2
-+    (( space = $(stat -c %s $file1) + $(stat -c %s $file2) ))
-+    $DTC -O dtb -p $space -o $file ${file%.dtb}.dts 2>/dev/null
-+
-+    # run_fdtput_test <test-name> <expected-result> <file> <key> <flags>
-+    #		<args>...
-+    run_fdtput_test "Simple string" "a_model" $file / model -ts "a_model"
-+    run_fdtput_test "Multiple string s" "board1 board2" \
-+	$file / compatible -ts board1 board2
-+    run_fdtput_test "Single string with spaces" "board1 board2" \
-+	$file / compatible -ts "board1 board2"
-+    run_fdtput_test "Integer" "32768" \
-+	$file /cpus/PowerPC,970@1 d-cache-size "" "32768"
-+    run_fdtput_test "Integer hex" "8001" \
-+	$file /cpus/PowerPC,970@1 d-cache-size -tx 0x8001
-+    run_fdtput_test "Integer list" "2 3 12" \
-+	$file /randomnode tricky1 -tbi "02 003 12"
-+    run_fdtput_test "Byte list short" "a b c ea ad be ef" \
-+	$file /randomnode blob -tbx "a b c ea ad be ef"
-+    run_fdtput_test "Integer list short" "a0b0c0d deeaae ef000000" \
-+	$file /randomnode blob -tx "a0b0c0d deeaae ef000000"
-+    run_fdtput_test "Large string list" "`cat $file1 $file2`" \
-+	$file /randomnode blob -ts "`cat $file1`" "`cat $file2`"
-+
-+    # This should be larger than available space in the fdt ($space)
-+    run_fdtput_test "Enormous string list" ERR \
-+	$file /randomnode blob -ts "`cat $bigfile1`" "`cat $bigfile2`"
-+
-+    # TODO: Add tests for verbose mode?
-+}
-+
- utilfdt_tests () {
-     run_test utilfdt_test
- }
-@@ -459,7 +527,7 @@ while getopts "vt:m" ARG ; do
- done
- 
- if [ -z "$TESTSETS" ]; then
--    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget"
-+    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget fdtput"
- fi
- 
- # Make sure we don't have stale blobs lying around
-@@ -482,6 +550,9 @@ for set in $TESTSETS; do
- 	"fdtget")
- 	    fdtget_tests
- 	    ;;
-+	"fdtput")
-+	    fdtput_tests
-+	    ;;
-     esac
- done
- 
-diff --git a/tests/tests.sh b/tests/tests.sh
-index d9a0524..6e5e76a 100644
---- a/tests/tests.sh
-+++ b/tests/tests.sh
-@@ -12,6 +12,7 @@ FAIL () {
- 
- DTC=../dtc
- DTGET=../fdtget
-+DTPUT=../fdtput
- 
- verbose_run () {
-     if [ -z "$QUIET_TEST" ]; then
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/22_Introduce-TESTS_BIN-in-Makefiles-to-identify-tested-.patch device-tree-compiler-1.4.5/debian/patches/22_Introduce-TESTS_BIN-in-Makefiles-to-identify-tested-.patch
--- device-tree-compiler-1.4.2/debian/patches/22_Introduce-TESTS_BIN-in-Makefiles-to-identify-tested-.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/22_Introduce-TESTS_BIN-in-Makefiles-to-identify-tested-.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-From 1456da7e2d3054882b20c120d817096bea21571e Mon Sep 17 00:00:00 2001
-From: Jon Loeliger <jdl@jdl.com>
-Date: Sat, 21 Jan 2012 15:24:51 -0600
-Subject: [PATCH 7/7] Introduce ${TESTS_BIN} in Makefiles to identify tested
- executables.
-
----
- Makefile             |    6 ++++++
- tests/Makefile.tests |    6 +++---
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 510caa6..1169e6c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -193,6 +193,12 @@ fdtput:	$(FDTPUT_OBJS) $(LIBFDT_archive)
- # Testsuite rules
- #
- TESTS_PREFIX=tests/
-+
-+TESTS_BIN += dtc
-+TESTS_BIN += convert-dtsv0
-+TESTS_BIN += fdtput
-+TESTS_BIN += fdtget
-+
- include tests/Makefile.tests
- 
- #
-diff --git a/tests/Makefile.tests b/tests/Makefile.tests
-index 3f92074..2eee708 100644
---- a/tests/Makefile.tests
-+++ b/tests/Makefile.tests
-@@ -65,13 +65,13 @@ tests_clean:
- 	rm -f $(STD_CLEANFILES:%=$(TESTS_PREFIX)%)
- 	rm -f $(TESTS_CLEANFILES)
- 
--check:	tests dtc convert-dtsv0
-+check:	tests ${TESTS_BIN}
- 	cd $(TESTS_PREFIX); ./run_tests.sh
- 
--checkm: tests dtc convert-dtsv0
-+checkm: tests ${TESTS_BIN}
- 	cd $(TESTS_PREFIX); ./run_tests.sh -m 2>&1 | tee vglog.$$$$
- 
--checkv:	tests dtc convert-dtsv0
-+checkv:	tests ${TESTS_BIN}
- 	cd $(TESTS_PREFIX); ./run_tests.sh -v
- 
- ifneq ($(DEPTARGETS),)
--- 
-1.7.8.3
-
diff -Nru device-tree-compiler-1.4.2/debian/patches/local-add-missing-header-706137.patch device-tree-compiler-1.4.5/debian/patches/local-add-missing-header-706137.patch
--- device-tree-compiler-1.4.2/debian/patches/local-add-missing-header-706137.patch	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/local-add-missing-header-706137.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Description: libfdt-dev: Missing header file prevents the library usage
- device-tree-compiler (1.3.0-3) unstable; urgency=low
- .
-   * libfdt-dev: Missing header file prevents the library usage
-     Thanks Domenico Andreoli (Closes: #706137)
-Author: Hector Oron <zumbi@debian.org>
-Bug-Debian: http://bugs.debian.org/706137
-
---- device-tree-compiler-1.3.0.orig/libfdt/Makefile.libfdt
-+++ device-tree-compiler-1.3.0/libfdt/Makefile.libfdt
-@@ -4,7 +4,7 @@
- # be easily embeddable into other systems of Makefiles.
- #
- LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1
--LIBFDT_INCLUDES = fdt.h libfdt.h
-+LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h
- LIBFDT_VERSION = version.lds
- LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
- LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
diff -Nru device-tree-compiler-1.4.2/debian/patches/series device-tree-compiler-1.4.5/debian/patches/series
--- device-tree-compiler-1.4.2/debian/patches/series	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/patches/series	2017-10-06 17:36:17.000000000 +0000
@@ -1,23 +1,3 @@
 01_build_doc.patch
-#02_remove-unused-check-variable.patch
-#03_Remove-unused-variable-in-flat_read_mem_reserve.patch
-#04_Split-out-is_printable_string-into-util.patch
-#05_Add-missing-tests-to-gitignore.patch
-#06_Refactor-character-literal-parsing-code.patch
-#07_Remove-gcc-4.6-set-but-not-used-warnings.patch
-#08_Support-character-literals-in-cell-lists.patch
-#09_Create-Makefile_utils-and-move-ftdump-into-it.patch
-#10_Add-fdt-read_write-utility-functions.patch
-#11_Make-testutils-use-utilfdt.patch
-#12_use-utilfdt-to-read-blob.patch
-#13_Add-fdt16_to_cpu-utility-function.patch
-#14_Add-data_append_integer-function.patch
-#15_Add-support-for-variable-sized-elements.patch
-#16_fdtdump-rename-from-ftdump.patch
-#17_libfdt-Add-support-for-appending-the-values-to-a-exi.patch
-#18_libfdt-Activate-testcase-for-appending-properties.patch
-#19_dtc-Implement-d-option-to-write-out-a-dependency-fil.patch
-#20_Add-fdtget-utility-to-read-property-values-from-a-de.patch
-#21_Add-fdtput-utility-to-write-property-values-to-a-dev.patch
-#22_Introduce-TESTS_BIN-in-Makefiles-to-identify-tested-.patch
-#local-add-missing-header-706137.patch
+02-checks-Use-proper-format-modifier-for-size_t.patch
+03-tests-Avoid-64-bit-arithmetic-in-assembler.patch
diff -Nru device-tree-compiler-1.4.2/debian/rules device-tree-compiler-1.4.5/debian/rules
--- device-tree-compiler-1.4.2/debian/rules	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/rules	2017-10-06 17:35:17.000000000 +0000
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# reproducible builds: texlive needs FORCE_SOURCE_DATE set in order to
+# respect SOURCE_DATE_EPOCH.
+export FORCE_SOURCE_DATE=1
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export CFLAGS = -Wall -g -fPIC
 
+# python library builds with warnings, temporarily disabled.
+export NO_PYTHON = 1
+
 include /usr/share/dpkg/architecture.mk
 ifeq ($(origin CC),default)
 export CC = $(DEB_HOST_GNU_TYPE)-gcc
@@ -21,58 +23,17 @@
 	CFLAGS += -O2
 endif
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	$(MAKE) CFLAGS="$(CFLAGS)"
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build 
 	$(MAKE) -C Documentation
-	touch build-stamp
 
-clean: clean1
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-	$(MAKE) clean
-	[ ! -f Documentation/Makefile ] || $(MAKE) -C Documentation clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install --list-missing --sourcedir=debian/tmp
-	touch install-stamp
 
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs Documentation/dtc-paper.dvi Documentation/dtc-paper.ps \
-		Documentation/dtc-paper.pdf Documentation/dtc-manual.txt
-	dh_installexamples
-	dh_installman debian/manpages/*
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_clean:
+	dh_auto_clean
+	[ ! -f Documentation/Makefile ] || $(MAKE) -C Documentation clean
+	[ ! -d build ] || rm -rf build
diff -Nru device-tree-compiler-1.4.2/debian/source/format device-tree-compiler-1.4.5/debian/source/format
--- device-tree-compiler-1.4.2/debian/source/format	2017-11-01 13:39:36.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/source/format	2017-10-06 17:35:17.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru device-tree-compiler-1.4.2/debian/watch device-tree-compiler-1.4.5/debian/watch
--- device-tree-compiler-1.4.2/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/debian/watch	2017-10-06 17:35:17.000000000 +0000
@@ -0,0 +1,3 @@
+version=4
+https://git.kernel.org/pub/scm/utils/dtc/dtc.git \
+  .*/snapshot/dtc-@ANY_VERSION@@ARCHIVE_EXT@
diff -Nru device-tree-compiler-1.4.2/Documentation/dt-object-internal.txt device-tree-compiler-1.4.5/Documentation/dt-object-internal.txt
--- device-tree-compiler-1.4.2/Documentation/dt-object-internal.txt	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/Documentation/dt-object-internal.txt	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,310 @@
+Device Tree Dynamic Object format internals
+-------------------------------------------
+
+The Device Tree for most platforms is a static representation of
+the hardware capabilities. This is insufficient for platforms
+that need to dynamically insert Device Tree fragments into the
+live tree.
+
+This document explains the the Device Tree object format and
+modifications made to the Device Tree compiler, which make it possible.
+
+1. Simplified Problem Definition
+--------------------------------
+
+Assume we have a platform which boots using following simplified Device Tree.
+
+---- foo.dts -----------------------------------------------------------------
+	/* FOO platform */
+	/ {
+		compatible = "corp,foo";
+
+		/* shared resources */
+		res: res {
+		};
+
+		/* On chip peripherals */
+		ocp: ocp {
+			/* peripherals that are always instantiated */
+			peripheral1 { ... };
+		};
+	};
+---- foo.dts -----------------------------------------------------------------
+
+We have a number of peripherals that after probing (using some undefined method)
+should result in different Device Tree configuration.
+
+We cannot boot with this static tree because due to the configuration of the
+foo platform there exist multiple conficting peripherals DT fragments.
+
+So for the bar peripheral we would have this:
+
+---- foo+bar.dts -------------------------------------------------------------
+	/* FOO platform + bar peripheral */
+	/ {
+		compatible = "corp,foo";
+
+		/* shared resources */
+		res: res {
+		};
+
+		/* On chip peripherals */
+		ocp: ocp {
+			/* peripherals that are always instantiated */
+			peripheral1 { ... };
+
+			/* bar peripheral */
+			bar {
+				compatible = "corp,bar";
+				... /* various properties and child nodes */
+			};
+		};
+	};
+---- foo+bar.dts -------------------------------------------------------------
+
+While for the baz peripheral we would have this:
+
+---- foo+baz.dts -------------------------------------------------------------
+	/* FOO platform + baz peripheral */
+	/ {
+		compatible = "corp,foo";
+
+		/* shared resources */
+		res: res {
+			/* baz resources */
+			baz_res: res_baz { ... };
+		};
+
+		/* On chip peripherals */
+		ocp: ocp {
+			/* peripherals that are always instantiated */
+			peripheral1 { ... };
+
+			/* baz peripheral */
+			baz {
+				compatible = "corp,baz";
+				/* reference to another point in the tree */
+				ref-to-res = <&baz_res>;
+				... /* various properties and child nodes */
+			};
+		};
+	};
+---- foo+baz.dts -------------------------------------------------------------
+
+We note that the baz case is more complicated, since the baz peripheral needs to
+reference another node in the DT tree.
+
+2. Device Tree Object Format Requirements
+-----------------------------------------
+
+Since the Device Tree is used for booting a number of very different hardware
+platforms it is imperative that we tread very carefully.
+
+2.a) No changes to the Device Tree binary format for the base tree. We cannot
+modify the tree format at all and all the information we require should be
+encoded using Device Tree itself. We can add nodes that can be safely ignored
+by both bootloaders and the kernel. The plugin dtbs are optionally tagged
+with a different magic number in the header but otherwise they're simple
+blobs.
+
+2.b) Changes to the DTS source format should be absolutely minimal, and should
+only be needed for the DT fragment definitions, and not the base boot DT.
+
+2.c) An explicit option should be used to instruct DTC to generate the required
+information needed for object resolution. Platforms that don't use the
+dynamic object format can safely ignore it.
+
+2.d) Finally, DT syntax changes should be kept to a minimum. It should be
+possible to express everything using the existing DT syntax.
+
+3. Implementation
+-----------------
+
+The basic unit of addressing in Device Tree is the phandle. Turns out it's
+relatively simple to extend the way phandles are generated and referenced
+so that it's possible to dynamically convert symbolic references (labels)
+to phandle values. This is a valid assumption as long as the author uses
+reference syntax and does not assign phandle values manually (which might
+be a problem with decompiled source files).
+
+We can roughly divide the operation into two steps.
+
+3.a) Compilation of the base board DTS file using the '-@' option
+generates a valid DT blob with an added __symbols__ node at the root node,
+containing a list of all nodes that are marked with a label.
+
+Using the foo.dts file above the following node will be generated;
+
+$ dtc -@ -O dtb -o foo.dtb -b 0 foo.dts
+$ fdtdump foo.dtb
+...
+/ {
+	...
+	res {
+		...
+		phandle = <0x00000001>;
+		...
+	};
+	ocp {
+		...
+		phandle = <0x00000002>;
+		...
+	};
+	__symbols__ {
+		res="/res";
+		ocp="/ocp";
+	};
+};
+
+Notice that all the nodes that had a label have been recorded, and that
+phandles have been generated for them.
+
+This blob can be used to boot the board normally, the __symbols__ node will
+be safely ignored both by the bootloader and the kernel (the only loss will
+be a few bytes of memory and disk space).
+
+We generate a __symbols__ node to record nodes that had labels in the base
+tree (or subsequent loaded overlays) so that they can be matched up with
+references made to them in Device Tree objects.
+
+3.b) The Device Tree fragments must be compiled with the same option but they
+must also have a tag (/plugin/) that allows undefined references to nodes
+that are not present at compilation time to be recorded so that the runtime
+loader can fix them.
+
+So the bar peripheral's DTS format would be of the form:
+
+/dts-v1/;
+/plugin/;	/* allow undefined references and record them */
+/ {
+	....	/* various properties for loader use; i.e. part id etc. */
+	fragment@0 {
+		target = <&ocp>;
+		__overlay__ {
+			/* bar peripheral */
+			bar {
+				compatible = "corp,bar";
+				... /* various properties and child nodes */
+			}
+		};
+	};
+};
+
+Note that there's a target property that specifies the location where the
+contents of the overlay node will be placed, and it references the node
+in the foo.dts file.
+
+$ dtc -@ -O dtb -o bar.dtbo -b 0 bar.dts
+$ fdtdump bar.dtbo
+...
+/ {
+	... /* properties */
+	fragment@0 {
+		target = <0xffffffff>;
+		__overlay__ {
+			bar {
+				compatible = "corp,bar";
+				... /* various properties and child nodes */
+			}
+		};
+	};
+	__fixups__ {
+	    ocp = "/fragment@0:target:0";
+	};
+};
+
+No __symbols__ node has been generated (no label in bar.dts).
+Note that the target's ocp label is undefined, so the phandle
+value is filled with the illegal value '0xffffffff', while a __fixups__
+node has been generated, which marks the location in the tree where
+the label lookup should store the runtime phandle value of the ocp node.
+
+The format of the __fixups__ node entry is
+
+  <label> = "<local-full-path>:<property-name>:<offset>" 
+	    [, "<local-full-path>:<property-name>:<offset>"...];
+
+  <label> 		Is the label we're referring
+  <local-full-path>	Is the full path of the node the reference is
+  <property-name>	Is the name of the property containing the
+			reference
+  <offset>		The offset (in bytes) of where the property's
+			phandle value is located.
+
+Doing the same with the baz peripheral's DTS format is a little bit more
+involved, since baz contains references to local labels which require
+local fixups.
+
+/dts-v1/;
+/plugin/;	/* allow undefined label references and record them */
+/ {
+	....	/* various properties for loader use; i.e. part id etc. */
+	fragment@0 {
+		target = <&res>;
+		__overlay__ {
+			/* baz resources */
+			baz_res: res_baz { ... };
+		};
+	};
+	fragment@1 {
+		target = <&ocp>;
+		__overlay__ {
+			/* baz peripheral */
+			baz {
+				compatible = "corp,baz";
+				/* reference to another point in the tree */
+				ref-to-res = <&baz_res>;
+				... /* various properties and child nodes */
+			}
+		};
+	};
+};
+
+Note that &bar_res reference.
+
+$ dtc -@ -O dtb -o baz.dtbo -b 0 baz.dts
+$ fdtdump baz.dtbo
+...
+/ {
+	... /* properties */
+	fragment@0 {
+		target = <0xffffffff>;
+		__overlay__ {
+			res_baz {
+				....
+				phandle = <0x00000001>;
+			};
+		};
+	};
+	fragment@1 {
+		target = <0xffffffff>;
+		__overlay__ {
+			baz {
+				compatible = "corp,baz";
+				... /* various properties and child nodes */
+				ref-to-res = <0x00000001>;
+			}
+		};
+	};
+	__fixups__ {
+		res = "/fragment@0:target:0";
+		ocp = "/fragment@1:target:0";
+	};
+	__local_fixups__ {
+		fragment@1 {
+			__overlay__ {
+				baz {
+					ref-to-res = <0>;
+				};
+			};
+		};
+	};
+};
+
+This is similar to the bar case, but the reference of a local label by the
+baz node generates a __local_fixups__ entry that records the place that the
+local reference is being made. No matter how phandles are allocated from dtc
+the run time loader must apply an offset to each phandle in every dynamic
+DT object loaded. The __local_fixups__ node records the offset relative to the
+start of every local reference within that property so that the loader can apply
+the offset.
diff -Nru device-tree-compiler-1.4.2/Documentation/manual.txt device-tree-compiler-1.4.5/Documentation/manual.txt
--- device-tree-compiler-1.4.2/Documentation/manual.txt	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/Documentation/manual.txt	2017-09-27 10:00:10.000000000 +0000
@@ -119,6 +119,20 @@
 	Make space for <number> reserve map entries
 	Relevant for dtb and asm output only.
 
+    -@
+	Generates a __symbols__ node at the root node of the resulting blob
+	for any node labels used, and for any local references using phandles
+	it also generates a __local_fixups__ node that tracks them.
+
+	When using the /plugin/ tag all unresolved label references to
+	be tracked in the __fixups__ node, making dynamic resolution possible.
+
+    -A
+	Generate automatically aliases for all node labels. This is similar to
+	the -@ option (the __symbols__ node contain identical information) but
+	the semantics are slightly different since no phandles are automatically
+	generated for labeled nodes.
+
     -S <bytes>
 	Ensure the blob at least <bytes> long, adding additional
 	space if needed.
@@ -146,13 +160,18 @@
 Here is a very rough overview of the layout of a DTS source file:
 
 
-    sourcefile:   list_of_memreserve devicetree
+    sourcefile:   versioninfo plugindecl list_of_memreserve devicetree
 
     memreserve:   label 'memreserve' ADDR ADDR ';'
 		| label 'memreserve' ADDR '-' ADDR ';'
 
     devicetree:   '/' nodedef
 
+    versioninfo:  '/' 'dts-v1' '/' ';'
+
+    plugindecl:   '/' 'plugin' '/' ';'
+                | /* empty */
+
     nodedef:      '{' list_of_property list_of_subnode '}' ';'
 
     property:     label PROPNAME '=' propdata ';'
@@ -209,7 +228,7 @@
 For example:
 
     - A child node named "childnode" whose unit name is
-      "childnode at address".  It it turn has a string property
+      "childnode at address".  It in turn has a string property
       called "childprop".
 
 	childnode@addresss {
@@ -655,4 +674,22 @@
 
 The syntax of the fdtdump command line is:
 
-    fdtdump <DTB-file-name>
+    fdtdump [options] <DTB-file-name>
+
+Where options are:
+    -d,--debug          Dump debug information while decoding the file
+    -s,--scan           Scan for an embedded fdt in given file
+
+3) fdtoverlay -- Flat Device Tree overlay applicator
+
+The fdtoverlay applies an arbitrary number of FDT overlays to a base FDT blob
+to a given output file.
+
+The syntax of the fdtoverlay command line is:
+
+    fdtoverlay -i <base-blob> -o <output-blob> <overlay-blob0> [<overlay-blob1> ...]
+
+Where options are:
+    -i, --input         Input base DT blob
+    -o, --output        Output DT blob
+    -v, --verbose       Verbose message output
diff -Nru device-tree-compiler-1.4.2/dtc.c device-tree-compiler-1.4.5/dtc.c
--- device-tree-compiler-1.4.2/dtc.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/dtc.c	2017-09-27 10:00:10.000000000 +0000
@@ -30,7 +30,16 @@
 int reservenum;		/* Number of memory reservation slots */
 int minsize;		/* Minimum blob size */
 int padsize;		/* Additional padding to blob */
-int phandle_format = PHANDLE_BOTH;	/* Use linux,phandle or phandle properties */
+int alignsize;		/* Additional padding to blob accroding to the alignsize */
+int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties */
+int generate_symbols;	/* enable symbols & fixup support */
+int generate_fixups;		/* suppress generation of fixups on symbol support */
+int auto_label_aliases;		/* auto generate labels -> aliases */
+
+static int is_power_of_2(int x)
+{
+	return (x > 0) && ((x & (x - 1)) == 0);
+}
 
 static void fill_fullpaths(struct node *tree, const char *prefix)
 {
@@ -53,7 +62,7 @@
 #define FDT_VERSION(version)	_FDT_VERSION(version)
 #define _FDT_VERSION(version)	#version
 static const char usage_synopsis[] = "dtc [options] <input file>";
-static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:hv";
+static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
 static struct option const usage_long_opts[] = {
 	{"quiet",            no_argument, NULL, 'q'},
 	{"in-format",         a_argument, NULL, 'I'},
@@ -64,6 +73,7 @@
 	{"reserve",           a_argument, NULL, 'R'},
 	{"space",             a_argument, NULL, 'S'},
 	{"pad",               a_argument, NULL, 'p'},
+	{"align",             a_argument, NULL, 'a'},
 	{"boot-cpu",          a_argument, NULL, 'b'},
 	{"force",            no_argument, NULL, 'f'},
 	{"include",           a_argument, NULL, 'i'},
@@ -71,6 +81,8 @@
 	{"phandle",           a_argument, NULL, 'H'},
 	{"warning",           a_argument, NULL, 'W'},
 	{"error",             a_argument, NULL, 'E'},
+	{"symbols",	     no_argument, NULL, '@'},
+	{"auto-alias",       no_argument, NULL, 'A'},
 	{"help",             no_argument, NULL, 'h'},
 	{"version",          no_argument, NULL, 'v'},
 	{NULL,               no_argument, NULL, 0x0},
@@ -91,6 +103,7 @@
 	"\n\tMake space for <number> reserve map entries (for dtb and asm output)",
 	"\n\tMake the blob at least <bytes> long (extra space)",
 	"\n\tAdd padding to the blob of <bytes> long (extra space)",
+	"\n\tMake the blob align to the <bytes> (extra space)",
 	"\n\tSet the physical boot cpu",
 	"\n\tTry to produce output even if the input tree has errors",
 	"\n\tAdd a path to search for include files",
@@ -101,6 +114,8 @@
 	 "\t\tboth   - Both \"linux,phandle\" and \"phandle\" properties",
 	"\n\tEnable/disable warnings (prefix with \"no-\")",
 	"\n\tEnable/disable errors (prefix with \"no-\")",
+	"\n\tEnable generation of symbols",
+	"\n\tEnable auto-alias of labels",
 	"\n\tPrint this help and exit",
 	"\n\tPrint version and exit",
 	NULL,
@@ -123,7 +138,7 @@
 static const char *guess_input_format(const char *fname, const char *fallback)
 {
 	struct stat statbuf;
-	uint32_t magic;
+	fdt32_t magic;
 	FILE *f;
 
 	if (stat(fname, &statbuf) != 0)
@@ -144,8 +159,7 @@
 	}
 	fclose(f);
 
-	magic = fdt32_to_cpu(magic);
-	if (magic == FDT_MAGIC)
+	if (fdt32_to_cpu(magic) == FDT_MAGIC)
 		return "dtb";
 
 	return guess_type_by_name(fname, fallback);
@@ -153,7 +167,7 @@
 
 int main(int argc, char *argv[])
 {
-	struct boot_info *bi;
+	struct dt_info *dti;
 	const char *inform = NULL;
 	const char *outform = NULL;
 	const char *outname = "-";
@@ -169,6 +183,7 @@
 	reservenum = 0;
 	minsize    = 0;
 	padsize    = 0;
+	alignsize  = 0;
 
 	while ((opt = util_getopt_long()) != EOF) {
 		switch (opt) {
@@ -196,6 +211,12 @@
 		case 'p':
 			padsize = strtol(optarg, NULL, 0);
 			break;
+		case 'a':
+			alignsize = strtol(optarg, NULL, 0);
+			if (!is_power_of_2(alignsize))
+				die("Invalid argument \"%d\" to -a option\n",
+				    alignsize);
+			break;
 		case 'f':
 			force = true;
 			break;
@@ -234,6 +255,13 @@
 			parse_checks_option(false, true, optarg);
 			break;
 
+		case '@':
+			generate_symbols = 1;
+			break;
+		case 'A':
+			auto_label_aliases = 1;
+			break;
+
 		case 'h':
 			usage(NULL);
 		default:
@@ -272,27 +300,45 @@
 		}
 	}
 	if (streq(inform, "dts"))
-		bi = dt_from_source(arg);
+		dti = dt_from_source(arg);
 	else if (streq(inform, "fs"))
-		bi = dt_from_fs(arg);
+		dti = dt_from_fs(arg);
 	else if(streq(inform, "dtb"))
-		bi = dt_from_blob(arg);
+		dti = dt_from_blob(arg);
 	else
 		die("Unknown input format \"%s\"\n", inform);
 
+	dti->outname = outname;
+
 	if (depfile) {
 		fputc('\n', depfile);
 		fclose(depfile);
 	}
 
 	if (cmdline_boot_cpuid != -1)
-		bi->boot_cpuid_phys = cmdline_boot_cpuid;
+		dti->boot_cpuid_phys = cmdline_boot_cpuid;
+
+	fill_fullpaths(dti->dt, "");
+	process_checks(force, dti);
+
+	/* on a plugin, generate by default */
+	if (dti->dtsflags & DTSF_PLUGIN) {
+		generate_fixups = 1;
+	}
 
-	fill_fullpaths(bi->dt, "");
-	process_checks(force, bi);
+	if (auto_label_aliases)
+		generate_label_tree(dti, "aliases", false);
+
+	if (generate_symbols)
+		generate_label_tree(dti, "__symbols__", true);
+
+	if (generate_fixups) {
+		generate_fixups_tree(dti, "__fixups__");
+		generate_local_fixups_tree(dti, "__local_fixups__");
+	}
 
 	if (sort)
-		sort_tree(bi);
+		sort_tree(dti);
 
 	if (streq(outname, "-")) {
 		outf = stdout;
@@ -304,11 +350,11 @@
 	}
 
 	if (streq(outform, "dts")) {
-		dt_to_source(outf, bi);
+		dt_to_source(outf, dti);
 	} else if (streq(outform, "dtb")) {
-		dt_to_blob(outf, bi, outversion);
+		dt_to_blob(outf, dti, outversion);
 	} else if (streq(outform, "asm")) {
-		dt_to_asm(outf, bi, outversion);
+		dt_to_asm(outf, dti, outversion);
 	} else if (streq(outform, "null")) {
 		/* do nothing */
 	} else {
diff -Nru device-tree-compiler-1.4.2/dtc.h device-tree-compiler-1.4.5/dtc.h
--- device-tree-compiler-1.4.2/dtc.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/dtc.h	2017-09-27 10:00:10.000000000 +0000
@@ -31,6 +31,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <libfdt_env.h>
 #include <fdt.h>
@@ -43,7 +44,6 @@
 #define debug(...)
 #endif
 
-
 #define DEFAULT_FDT_VERSION	17
 
 /*
@@ -53,7 +53,11 @@
 extern int reservenum;		/* Number of memory reservation slots */
 extern int minsize;		/* Minimum blob size */
 extern int padsize;		/* Additional padding to blob */
+extern int alignsize;		/* Additional padding to blob accroding to the alignsize */
 extern int phandle_format;	/* Use linux,phandle or phandle properties */
+extern int generate_symbols;	/* generate symbols for nodes with labels */
+extern int generate_fixups;	/* generate fixups */
+extern int auto_label_aliases;	/* auto generate labels -> aliases */
 
 #define PHANDLE_LEGACY	0x1
 #define PHANDLE_EPAPR	0x2
@@ -110,7 +114,7 @@
 struct data data_merge(struct data d1, struct data d2);
 struct data data_append_cell(struct data d, cell_t word);
 struct data data_append_integer(struct data d, uint64_t word, int bits);
-struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);
+struct data data_append_re(struct data d, uint64_t address, uint64_t size);
 struct data data_append_addr(struct data d, uint64_t addr);
 struct data data_append_byte(struct data d, uint8_t byte);
 struct data data_append_zeroes(struct data d, int len);
@@ -132,6 +136,10 @@
 	struct label *next;
 };
 
+struct bus_type {
+	const char *name;
+};
+
 struct property {
 	bool deleted;
 	char *name;
@@ -158,6 +166,7 @@
 	int addr_cells, size_cells;
 
 	struct label *labels;
+	const struct bus_type *bus;
 };
 
 #define for_each_label_withdel(l0, l) \
@@ -201,10 +210,13 @@
 void add_child(struct node *parent, struct node *child);
 void delete_node_by_name(struct node *parent, char *name);
 void delete_node(struct node *node);
+void append_to_property(struct node *node,
+			char *name, const void *data, int len);
 
 const char *get_unitname(struct node *node);
 struct property *get_property(struct node *node, const char *propname);
 cell_t propval_cell(struct property *prop);
+cell_t propval_cell_n(struct property *prop, int n);
 struct property *get_property_by_label(struct node *tree, const char *label,
 				       struct node **node);
 struct marker *get_marker_label(struct node *tree, const char *label,
@@ -221,7 +233,7 @@
 /* Boot info (tree plus memreserve information */
 
 struct reserve_info {
-	struct fdt_reserve_entry re;
+	uint64_t address, size;
 
 	struct reserve_info *next;
 
@@ -235,35 +247,45 @@
 				       struct reserve_info *new);
 
 
-struct boot_info {
+struct dt_info {
+	unsigned int dtsflags;
 	struct reserve_info *reservelist;
-	struct node *dt;		/* the device tree */
 	uint32_t boot_cpuid_phys;
+	struct node *dt;		/* the device tree */
+	const char *outname;		/* filename being written to, "-" for stdout */
 };
 
-struct boot_info *build_boot_info(struct reserve_info *reservelist,
-				  struct node *tree, uint32_t boot_cpuid_phys);
-void sort_tree(struct boot_info *bi);
+/* DTS version flags definitions */
+#define DTSF_V1		0x0001	/* /dts-v1/ */
+#define DTSF_PLUGIN	0x0002	/* /plugin/ */
+
+struct dt_info *build_dt_info(unsigned int dtsflags,
+			      struct reserve_info *reservelist,
+			      struct node *tree, uint32_t boot_cpuid_phys);
+void sort_tree(struct dt_info *dti);
+void generate_label_tree(struct dt_info *dti, char *name, bool allocph);
+void generate_fixups_tree(struct dt_info *dti, char *name);
+void generate_local_fixups_tree(struct dt_info *dti, char *name);
 
 /* Checks */
 
 void parse_checks_option(bool warn, bool error, const char *arg);
-void process_checks(bool force, struct boot_info *bi);
+void process_checks(bool force, struct dt_info *dti);
 
 /* Flattened trees */
 
-void dt_to_blob(FILE *f, struct boot_info *bi, int version);
-void dt_to_asm(FILE *f, struct boot_info *bi, int version);
+void dt_to_blob(FILE *f, struct dt_info *dti, int version);
+void dt_to_asm(FILE *f, struct dt_info *dti, int version);
 
-struct boot_info *dt_from_blob(const char *fname);
+struct dt_info *dt_from_blob(const char *fname);
 
 /* Tree source */
 
-void dt_to_source(FILE *f, struct boot_info *bi);
-struct boot_info *dt_from_source(const char *f);
+void dt_to_source(FILE *f, struct dt_info *dti);
+struct dt_info *dt_from_source(const char *f);
 
 /* FS trees */
 
-struct boot_info *dt_from_fs(const char *dirname);
+struct dt_info *dt_from_fs(const char *dirname);
 
 #endif /* _DTC_H */
diff -Nru device-tree-compiler-1.4.2/dtc-lexer.l device-tree-compiler-1.4.5/dtc-lexer.l
--- device-tree-compiler-1.4.2/dtc-lexer.l	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/dtc-lexer.l	2017-09-27 10:00:10.000000000 +0000
@@ -62,7 +62,8 @@
 
 static void push_input_file(const char *filename);
 static bool pop_input_file(void);
-static void lexical_error(const char *fmt, ...);
+static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
+
 %}
 
 %%
@@ -121,6 +122,11 @@
 			return DT_V1;
 		}
 
+<*>"/plugin/"	{
+			DPRINT("Keyword: /plugin/\n");
+			return DT_PLUGIN;
+		}
+
 <*>"/memreserve/"	{
 			DPRINT("Keyword: /memreserve/\n");
 			BEGIN_DEFAULT();
@@ -184,16 +190,16 @@
 			if (d.len == 1) {
 				lexical_error("Empty character literal");
 				yylval.integer = 0;
-				return DT_CHAR_LITERAL;
-			}
-
-			yylval.integer = (unsigned char)d.val[0];
+			} else {
+				yylval.integer = (unsigned char)d.val[0];
 
-			if (d.len > 2)
-				lexical_error("Character literal has %d"
-					      " characters instead of 1",
-					      d.len - 1);
+				if (d.len > 2)
+					lexical_error("Character literal has %d"
+						      " characters instead of 1",
+						      d.len - 1);
+			}
 
+			data_free(d);
 			return DT_CHAR_LITERAL;
 		}
 
diff -Nru device-tree-compiler-1.4.2/dtc-parser.y device-tree-compiler-1.4.5/dtc-parser.y
--- device-tree-compiler-1.4.2/dtc-parser.y	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/dtc-parser.y	2017-09-27 10:00:10.000000000 +0000
@@ -19,6 +19,7 @@
  */
 %{
 #include <stdio.h>
+#include <inttypes.h>
 
 #include "dtc.h"
 #include "srcpos.h"
@@ -31,7 +32,7 @@
 		treesource_error = true; \
 	} while (0)
 
-extern struct boot_info *the_boot_info;
+extern struct dt_info *parser_output;
 extern bool treesource_error;
 %}
 
@@ -52,9 +53,11 @@
 	struct node *nodelist;
 	struct reserve_info *re;
 	uint64_t integer;
+	unsigned int flags;
 }
 
 %token DT_V1
+%token DT_PLUGIN
 %token DT_MEMRESERVE
 %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR
 %token DT_BITS
@@ -71,6 +74,8 @@
 
 %type <data> propdata
 %type <data> propdataprefix
+%type <flags> header
+%type <flags> headers
 %type <re> memreserve
 %type <re> memreserves
 %type <array> arrayprefix
@@ -101,16 +106,32 @@
 %%
 
 sourcefile:
-	  v1tag memreserves devicetree
+	  headers memreserves devicetree
 		{
-			the_boot_info = build_boot_info($2, $3,
-							guess_boot_cpuid($3));
+			parser_output = build_dt_info($1, $2, $3,
+			                              guess_boot_cpuid($3));
 		}
 	;
 
-v1tag:
+header:
 	  DT_V1 ';'
-	| DT_V1 ';' v1tag
+		{
+			$$ = DTSF_V1;
+		}
+	| DT_V1 ';' DT_PLUGIN ';'
+		{
+			$$ = DTSF_V1 | DTSF_PLUGIN;
+		}
+	;
+
+headers:
+	  header
+	| header headers
+		{
+			if ($2 != $1)
+				ERROR(&@2, "Header flags don't match earlier ones");
+			$$ = $1;
+		}
 	;
 
 memreserves:
@@ -150,10 +171,10 @@
 		{
 			struct node *target = get_node_by_ref($1, $3);
 
-			add_label(&target->labels, $2);
-			if (target)
+			if (target) {
+				add_label(&target->labels, $2);
 				merge_nodes(target, $4);
-			else
+			} else
 				ERROR(&@3, "Label or path %s not found", $3);
 			$$ = $1;
 		}
diff -Nru device-tree-compiler-1.4.2/fdtdump.c device-tree-compiler-1.4.5/fdtdump.c
--- device-tree-compiler-1.4.2/fdtdump.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/fdtdump.c	2017-09-27 10:00:10.000000000 +0000
@@ -16,10 +16,11 @@
 #include "util.h"
 
 #define FDT_MAGIC_SIZE	4
+#define MAX_VERSION 17
 
 #define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
 #define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a))))
-#define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
+#define GET_CELL(p)	(p += 4, *((const fdt32_t *)(p-4)))
 
 static const char *tagname(uint32_t tag)
 {
@@ -159,6 +160,20 @@
 	USAGE_COMMON_OPTS_HELP
 };
 
+static bool valid_header(char *p, off_t len)
+{
+	if (len < sizeof(struct fdt_header) ||
+	    fdt_magic(p) != FDT_MAGIC ||
+	    fdt_version(p) > MAX_VERSION ||
+	    fdt_last_comp_version(p) > MAX_VERSION ||
+	    fdt_totalsize(p) >= len ||
+	    fdt_off_dt_struct(p) >= len ||
+	    fdt_off_dt_strings(p) >= len)
+		return 0;
+	else
+		return 1;
+}
+
 int main(int argc, char *argv[])
 {
 	int opt;
@@ -168,6 +183,11 @@
 	bool scan = false;
 	off_t len;
 
+	fprintf(stderr, "\n"
+"**** fdtdump is a low-level debugging tool, not meant for general use.\n"
+"**** If you want to decompile a dtb, you probably want\n"
+"****     dtc -I dtb -O dts <filename>\n\n"
+		);
 	while ((opt = util_getopt_long()) != EOF) {
 		switch (opt) {
 		case_USAGE_COMMON_FLAGS
@@ -204,12 +224,7 @@
 			if (fdt_magic(p) == FDT_MAGIC) {
 				/* try and validate the main struct */
 				off_t this_len = endp - p;
-				fdt32_t max_version = 17;
-				if (fdt_version(p) <= max_version &&
-				    fdt_last_comp_version(p) < max_version &&
-				    fdt_totalsize(p) < this_len &&
-				    fdt_off_dt_struct(p) < this_len &&
-					fdt_off_dt_strings(p) < this_len)
+				if (valid_header(p, this_len))
 					break;
 				if (debug)
 					printf("%s: skipping fdt magic at offset %#zx\n",
@@ -217,11 +232,12 @@
 			}
 			++p;
 		}
-		if (!p || ((endp - p) < FDT_MAGIC_SIZE))
+		if (!p || endp - p < sizeof(struct fdt_header))
 			die("%s: could not locate fdt magic\n", file);
 		printf("%s: found fdt at offset %#zx\n", file, p - buf);
 		buf = p;
-	}
+	} else if (!valid_header(buf, len))
+		die("%s: header is not valid\n", file);
 
 	dump_blob(buf, debug);
 
diff -Nru device-tree-compiler-1.4.2/fdtget.c device-tree-compiler-1.4.5/fdtget.c
--- device-tree-compiler-1.4.2/fdtget.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/fdtget.c	2017-09-27 10:00:10.000000000 +0000
@@ -54,6 +54,37 @@
 }
 
 /**
+ * Shows a list of cells in the requested format
+ *
+ * @param disp		Display information / options
+ * @param data		Data to display
+ * @param len		Maximum length of buffer
+ * @param size		Data size to use for display (e.g. 4 for 32-bit)
+ * @return 0 if ok, -1 on error
+ */
+static int show_cell_list(struct display_info *disp, const char *data, int len,
+			  int size)
+{
+	const uint8_t *p = (const uint8_t *)data;
+	char fmt[3];
+	int value;
+	int i;
+
+	fmt[0] = '%';
+	fmt[1] = disp->type ? disp->type : 'd';
+	fmt[2] = '\0';
+	for (i = 0; i < len; i += size, p += size) {
+		if (i)
+			printf(" ");
+		value = size == 4 ? fdt32_to_cpu(*(const fdt32_t *)p) :
+			size == 2 ? (*p << 8) | p[1] : *p;
+		printf(fmt, value);
+	}
+
+	return 0;
+}
+
+/**
  * Displays data of a given length according to selected options
  *
  * If a specific data type is provided in disp, then this is used. Otherwise
@@ -66,12 +97,9 @@
  */
 static int show_data(struct display_info *disp, const char *data, int len)
 {
-	int i, size;
-	const uint8_t *p = (const uint8_t *)data;
+	int size;
 	const char *s;
-	int value;
 	int is_string;
-	char fmt[3];
 
 	/* no data, don't print */
 	if (len == 0)
@@ -99,17 +127,8 @@
 				"selected data size\n");
 		return -1;
 	}
-	fmt[0] = '%';
-	fmt[1] = disp->type ? disp->type : 'd';
-	fmt[2] = '\0';
-	for (i = 0; i < len; i += size, p += size) {
-		if (i)
-			printf(" ");
-		value = size == 4 ? fdt32_to_cpu(*(const uint32_t *)p) :
-			size == 2 ? (*p << 8) | p[1] : *p;
-		printf(fmt, value);
-	}
-	return 0;
+
+	return show_cell_list(disp, data, len, size);
 }
 
 /**
@@ -245,7 +264,7 @@
  * @param filename	Filename of blob file
  * @param arg		List of arguments to process
  * @param arg_count	Number of arguments
- * @param return 0 if ok, -ve on error
+ * @return 0 if ok, -ve on error
  */
 static int do_fdtget(struct display_info *disp, const char *filename,
 		     char **arg, int arg_count, int args_per_step)
diff -Nru device-tree-compiler-1.4.2/fdtoverlay.c device-tree-compiler-1.4.5/fdtoverlay.c
--- device-tree-compiler-1.4.2/fdtoverlay.c	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/fdtoverlay.c	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2017 Konsulko Group Inc. All rights reserved.
+ *
+ * Author:
+ *	 Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <assert.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <alloca.h>
+#include <inttypes.h>
+
+#include <libfdt.h>
+
+#include "util.h"
+
+/* Usage related data. */
+static const char usage_synopsis[] =
+	"apply a number of overlays to a base blob\n"
+	"	fdtoverlay <options> [<overlay.dtbo> [<overlay.dtbo>]]\n"
+	"\n"
+	USAGE_TYPE_MSG;
+static const char usage_short_opts[] = "i:o:v" USAGE_COMMON_SHORT_OPTS;
+static struct option const usage_long_opts[] = {
+	{"input",            required_argument, NULL, 'i'},
+	{"output",	     required_argument, NULL, 'o'},
+	{"verbose",	           no_argument, NULL, 'v'},
+	USAGE_COMMON_LONG_OPTS,
+};
+static const char * const usage_opts_help[] = {
+	"Input base DT blob",
+	"Output DT blob",
+	"Verbose messages",
+	USAGE_COMMON_OPTS_HELP
+};
+
+int verbose = 0;
+
+static int do_fdtoverlay(const char *input_filename,
+			 const char *output_filename,
+			 int argc, char *argv[])
+{
+	char *blob = NULL;
+	char **ovblob = NULL;
+	off_t blob_len, ov_len, total_len;
+	int i, ret = -1;
+
+	blob = utilfdt_read_len(input_filename, &blob_len);
+	if (!blob) {
+		fprintf(stderr, "\nFailed to read base blob %s\n",
+				input_filename);
+		goto out_err;
+	}
+	if (fdt_totalsize(blob) > blob_len) {
+		fprintf(stderr,
+ "\nBase blob is incomplete (%lu / %" PRIu32 " bytes read)\n",
+			(unsigned long)blob_len, fdt_totalsize(blob));
+		goto out_err;
+	}
+	ret = 0;
+
+	/* allocate blob pointer array */
+	ovblob = alloca(sizeof(*ovblob) * argc);
+	memset(ovblob, 0, sizeof(*ovblob) * argc);
+
+	/* read and keep track of the overlay blobs */
+	total_len = 0;
+	for (i = 0; i < argc; i++) {
+		ovblob[i] = utilfdt_read_len(argv[i], &ov_len);
+		if (!ovblob[i]) {
+			fprintf(stderr, "\nFailed to read overlay %s\n",
+					argv[i]);
+			goto out_err;
+		}
+		total_len += ov_len;
+	}
+
+	/* grow the blob to worst case */
+	blob_len = fdt_totalsize(blob) + total_len;
+	blob = xrealloc(blob, blob_len);
+	fdt_open_into(blob, blob, blob_len);
+
+	/* apply the overlays in sequence */
+	for (i = 0; i < argc; i++) {
+		ret = fdt_overlay_apply(blob, ovblob[i]);
+		if (ret) {
+			fprintf(stderr, "\nFailed to apply %s (%d)\n",
+					argv[i], ret);
+			goto out_err;
+		}
+	}
+
+	fdt_pack(blob);
+	ret = utilfdt_write(output_filename, blob);
+	if (ret)
+		fprintf(stderr, "\nFailed to write output blob %s\n",
+				output_filename);
+
+out_err:
+	if (ovblob) {
+		for (i = 0; i < argc; i++) {
+			if (ovblob[i])
+				free(ovblob[i]);
+		}
+	}
+	free(blob);
+
+	return ret;
+}
+
+int main(int argc, char *argv[])
+{
+	int opt, i;
+	char *input_filename = NULL;
+	char *output_filename = NULL;
+
+	while ((opt = util_getopt_long()) != EOF) {
+		switch (opt) {
+		case_USAGE_COMMON_FLAGS
+
+		case 'i':
+			input_filename = optarg;
+			break;
+		case 'o':
+			output_filename = optarg;
+			break;
+		case 'v':
+			verbose = 1;
+			break;
+		}
+	}
+
+	if (!input_filename)
+		usage("missing input file");
+
+	if (!output_filename)
+		usage("missing output file");
+
+	argv += optind;
+	argc -= optind;
+
+	if (argc <= 0)
+		usage("missing overlay file(s)");
+
+	if (verbose) {
+		printf("input  = %s\n", input_filename);
+		printf("output = %s\n", output_filename);
+		for (i = 0; i < argc; i++)
+			printf("overlay[%d] = %s\n", i, argv[i]);
+	}
+
+	if (do_fdtoverlay(input_filename, output_filename, argc, argv))
+		return 1;
+
+	return 0;
+}
diff -Nru device-tree-compiler-1.4.2/fdtput.c device-tree-compiler-1.4.5/fdtput.c
--- device-tree-compiler-1.4.2/fdtput.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/fdtput.c	2017-09-27 10:00:10.000000000 +0000
@@ -67,7 +67,7 @@
  * @param arg		List of arguments from command line
  * @param arg_count	Number of arguments (may be 0)
  * @param valuep	Returns buffer containing value
- * @param *value_len	Returns length of value encoded
+ * @param value_len	Returns length of value encoded
  */
 static int encode_value(struct display_info *disp, char **arg, int arg_count,
 			char **valuep, int *value_len)
@@ -107,7 +107,7 @@
 			if (disp->verbose)
 				fprintf(stderr, "\tstring: '%s'\n", ptr);
 		} else {
-			int *iptr = (int *)ptr;
+			fdt32_t *iptr = (fdt32_t *)ptr;
 			sscanf(*arg, fmt, &ival);
 			if (len == 4)
 				*iptr = cpu_to_fdt32(ival);
diff -Nru device-tree-compiler-1.4.2/flattree.c device-tree-compiler-1.4.5/flattree.c
--- device-tree-compiler-1.4.2/flattree.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/flattree.c	2017-09-27 10:00:10.000000000 +0000
@@ -49,7 +49,7 @@
 
 struct emitter {
 	void (*cell)(void *, cell_t);
-	void (*string)(void *, char *, int);
+	void (*string)(void *, const char *, int);
 	void (*align)(void *, int);
 	void (*data)(void *, struct data);
 	void (*beginnode)(void *, struct label *labels);
@@ -64,7 +64,7 @@
 	*dtbuf = data_append_cell(*dtbuf, val);
 }
 
-static void bin_emit_string(void *e, char *str, int len)
+static void bin_emit_string(void *e, const char *str, int len)
 {
 	struct data *dtbuf = e;
 
@@ -144,22 +144,14 @@
 		(val >> 8) & 0xff, val & 0xff);
 }
 
-static void asm_emit_string(void *e, char *str, int len)
+static void asm_emit_string(void *e, const char *str, int len)
 {
 	FILE *f = e;
-	char c = 0;
 
-	if (len != 0) {
-		/* XXX: ewww */
-		c = str[len];
-		str[len] = '\0';
-	}
-
-	fprintf(f, "\t.string\t\"%s\"\n", str);
-
-	if (len != 0) {
-		str[len] = c;
-	}
+	if (len != 0)
+		fprintf(f, "\t.string\t\"%.*s\"\n", len, str);
+	else
+		fprintf(f, "\t.string\t\"%s\"\n", str);
 }
 
 static void asm_emit_align(void *e, int a)
@@ -179,7 +171,7 @@
 		emit_offset_label(f, m->ref, m->offset);
 
 	while ((d.len - off) >= sizeof(uint32_t)) {
-		asm_emit_cell(e, fdt32_to_cpu(*((uint32_t *)(d.val+off))));
+		asm_emit_cell(e, fdt32_to_cpu(*((fdt32_t *)(d.val+off))));
 		off += sizeof(uint32_t);
 	}
 
@@ -318,17 +310,16 @@
 {
 	struct reserve_info *re;
 	struct data d = empty_data;
-	static struct fdt_reserve_entry null_re = {0,0};
 	int    j;
 
 	for (re = reservelist; re; re = re->next) {
-		d = data_append_re(d, &re->re);
+		d = data_append_re(d, re->address, re->size);
 	}
 	/*
 	 * Add additional reserved slots if the user asked for them.
 	 */
 	for (j = 0; j < reservenum; j++) {
-		d = data_append_re(d, &null_re);
+		d = data_append_re(d, 0, 0);
 	}
 
 	return d;
@@ -366,7 +357,7 @@
 		fdt->size_dt_struct = cpu_to_fdt32(dtsize);
 }
 
-void dt_to_blob(FILE *f, struct boot_info *bi, int version)
+void dt_to_blob(FILE *f, struct dt_info *dti, int version)
 {
 	struct version_info *vi = NULL;
 	int i;
@@ -384,29 +375,36 @@
 	if (!vi)
 		die("Unknown device tree blob version %d\n", version);
 
-	flatten_tree(bi->dt, &bin_emitter, &dtbuf, &strbuf, vi);
+	flatten_tree(dti->dt, &bin_emitter, &dtbuf, &strbuf, vi);
 	bin_emit_cell(&dtbuf, FDT_END);
 
-	reservebuf = flatten_reserve_list(bi->reservelist, vi);
+	reservebuf = flatten_reserve_list(dti->reservelist, vi);
 
 	/* Make header */
 	make_fdt_header(&fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,
-			bi->boot_cpuid_phys);
+			dti->boot_cpuid_phys);
 
 	/*
 	 * If the user asked for more space than is used, adjust the totalsize.
 	 */
 	if (minsize > 0) {
 		padlen = minsize - fdt32_to_cpu(fdt.totalsize);
-		if ((padlen < 0) && (quiet < 1))
-			fprintf(stderr,
-				"Warning: blob size %d >= minimum size %d\n",
-				fdt32_to_cpu(fdt.totalsize), minsize);
+		if (padlen < 0) {
+			padlen = 0;
+			if (quiet < 1)
+				fprintf(stderr,
+					"Warning: blob size %d >= minimum size %d\n",
+					fdt32_to_cpu(fdt.totalsize), minsize);
+		}
 	}
 
 	if (padsize > 0)
 		padlen = padsize;
 
+	if (alignsize > 0)
+		padlen = ALIGN(fdt32_to_cpu(fdt.totalsize) + padlen, alignsize)
+			- fdt32_to_cpu(fdt.totalsize);
+
 	if (padlen > 0) {
 		int tsize = fdt32_to_cpu(fdt.totalsize);
 		tsize += padlen;
@@ -460,7 +458,7 @@
 	}
 }
 
-void dt_to_asm(FILE *f, struct boot_info *bi, int version)
+void dt_to_asm(FILE *f, struct dt_info *dti, int version)
 {
 	struct version_info *vi = NULL;
 	int i;
@@ -500,7 +498,7 @@
 
 	if (vi->flags & FTF_BOOTCPUID) {
 		fprintf(f, "\t/* boot_cpuid_phys */\n");
-		asm_emit_cell(f, bi->boot_cpuid_phys);
+		asm_emit_cell(f, dti->boot_cpuid_phys);
 	}
 
 	if (vi->flags & FTF_STRTABSIZE) {
@@ -530,18 +528,18 @@
 	 * Use .long on high and low halfs of u64s to avoid .quad
 	 * as it appears .quad isn't available in some assemblers.
 	 */
-	for (re = bi->reservelist; re; re = re->next) {
+	for (re = dti->reservelist; re; re = re->next) {
 		struct label *l;
 
 		for_each_label(re->labels, l) {
 			fprintf(f, "\t.globl\t%s\n", l->label);
 			fprintf(f, "%s:\n", l->label);
 		}
-		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.address >> 32));
+		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->address >> 32));
 		ASM_EMIT_BELONG(f, "0x%08x",
-				(unsigned int)(re->re.address & 0xffffffff));
-		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size >> 32));
-		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size & 0xffffffff));
+				(unsigned int)(re->address & 0xffffffff));
+		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->size >> 32));
+		ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->size & 0xffffffff));
 	}
 	for (i = 0; i < reservenum; i++) {
 		fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
@@ -550,7 +548,7 @@
 	fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
 
 	emit_label(f, symprefix, "struct_start");
-	flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi);
+	flatten_tree(dti->dt, &asm_emitter, f, &strbuf, vi);
 
 	fprintf(f, "\t/* FDT_END */\n");
 	asm_emit_cell(f, FDT_END);
@@ -572,6 +570,8 @@
 	if (padsize > 0) {
 		fprintf(f, "\t.space\t%d, 0\n", padsize);
 	}
+	if (alignsize > 0)
+		asm_emit_align(f, alignsize);
 	emit_label(f, symprefix, "blob_abs_end");
 
 	data_free(strbuf);
@@ -600,7 +600,7 @@
 
 static uint32_t flat_read_word(struct inbuf *inb)
 {
-	uint32_t val;
+	fdt32_t val;
 
 	assert(((inb->ptr - inb->base) % sizeof(val)) == 0);
 
@@ -709,13 +709,15 @@
 	 * First pass, count entries.
 	 */
 	while (1) {
+		uint64_t address, size;
+
 		flat_read_chunk(inb, &re, sizeof(re));
-		re.address  = fdt64_to_cpu(re.address);
-		re.size = fdt64_to_cpu(re.size);
-		if (re.size == 0)
+		address  = fdt64_to_cpu(re.address);
+		size = fdt64_to_cpu(re.size);
+		if (size == 0)
 			break;
 
-		new = build_reserve_entry(re.address, re.size);
+		new = build_reserve_entry(address, size);
 		reservelist = add_reserve_entry(reservelist, new);
 	}
 
@@ -805,9 +807,10 @@
 }
 
 
-struct boot_info *dt_from_blob(const char *fname)
+struct dt_info *dt_from_blob(const char *fname)
 {
 	FILE *f;
+	fdt32_t magic_buf, totalsize_buf;
 	uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys;
 	uint32_t off_dt, off_str, off_mem_rsvmap;
 	int rc;
@@ -824,7 +827,7 @@
 
 	f = srcfile_relative_open(fname, NULL);
 
-	rc = fread(&magic, sizeof(magic), 1, f);
+	rc = fread(&magic_buf, sizeof(magic_buf), 1, f);
 	if (ferror(f))
 		die("Error reading DT blob magic number: %s\n",
 		    strerror(errno));
@@ -835,11 +838,11 @@
 			die("Mysterious short read reading magic number\n");
 	}
 
-	magic = fdt32_to_cpu(magic);
+	magic = fdt32_to_cpu(magic_buf);
 	if (magic != FDT_MAGIC)
 		die("Blob has incorrect magic number\n");
 
-	rc = fread(&totalsize, sizeof(totalsize), 1, f);
+	rc = fread(&totalsize_buf, sizeof(totalsize_buf), 1, f);
 	if (ferror(f))
 		die("Error reading DT blob size: %s\n", strerror(errno));
 	if (rc < 1) {
@@ -849,7 +852,7 @@
 			die("Mysterious short read reading blob size\n");
 	}
 
-	totalsize = fdt32_to_cpu(totalsize);
+	totalsize = fdt32_to_cpu(totalsize_buf);
 	if (totalsize < FDT_V1_SIZE)
 		die("DT blob size (%d) is too small\n", totalsize);
 
@@ -933,5 +936,5 @@
 
 	fclose(f);
 
-	return build_boot_info(reservelist, tree, boot_cpuid_phys);
+	return build_dt_info(DTSF_V1, reservelist, tree, boot_cpuid_phys);
 }
diff -Nru device-tree-compiler-1.4.2/fstree.c device-tree-compiler-1.4.5/fstree.c
--- device-tree-compiler-1.4.2/fstree.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/fstree.c	2017-09-27 10:00:10.000000000 +0000
@@ -79,13 +79,12 @@
 	return tree;
 }
 
-struct boot_info *dt_from_fs(const char *dirname)
+struct dt_info *dt_from_fs(const char *dirname)
 {
 	struct node *tree;
 
 	tree = read_fstree(dirname);
 	tree = name_node(tree, "");
 
-	return build_boot_info(NULL, tree, guess_boot_cpuid(tree));
+	return build_dt_info(DTSF_V1, NULL, tree, guess_boot_cpuid(tree));
 }
-
diff -Nru device-tree-compiler-1.4.2/.gitignore device-tree-compiler-1.4.5/.gitignore
--- device-tree-compiler-1.4.2/.gitignore	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/.gitignore	2017-09-27 10:00:10.000000000 +0000
@@ -13,5 +13,6 @@
 /version_gen.h
 /fdtget
 /fdtput
+/fdtoverlay
 /patches
 /.pc
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_empty_tree.c device-tree-compiler-1.4.5/libfdt/fdt_empty_tree.c
--- device-tree-compiler-1.4.2/libfdt/fdt_empty_tree.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_empty_tree.c	2017-09-27 10:00:10.000000000 +0000
@@ -81,4 +81,3 @@
 
 	return fdt_open_into(buf, buf, bufsize);
 }
-
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_overlay.c device-tree-compiler-1.4.5/libfdt/fdt_overlay.c
--- device-tree-compiler-1.4.2/libfdt/fdt_overlay.c	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_overlay.c	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,861 @@
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+/**
+ * overlay_get_target_phandle - retrieves the target phandle of a fragment
+ * @fdto: pointer to the device tree overlay blob
+ * @fragment: node offset of the fragment in the overlay
+ *
+ * overlay_get_target_phandle() retrieves the target phandle of an
+ * overlay fragment when that fragment uses a phandle (target
+ * property) instead of a path (target-path property).
+ *
+ * returns:
+ *      the phandle pointed by the target property
+ *      0, if the phandle was not found
+ *	-1, if the phandle was malformed
+ */
+static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
+{
+	const fdt32_t *val;
+	int len;
+
+	val = fdt_getprop(fdto, fragment, "target", &len);
+	if (!val)
+		return 0;
+
+	if ((len != sizeof(*val)) || (fdt32_to_cpu(*val) == (uint32_t)-1))
+		return (uint32_t)-1;
+
+	return fdt32_to_cpu(*val);
+}
+
+/**
+ * overlay_get_target - retrieves the offset of a fragment's target
+ * @fdt: Base device tree blob
+ * @fdto: Device tree overlay blob
+ * @fragment: node offset of the fragment in the overlay
+ * @pathp: pointer which receives the path of the target (or NULL)
+ *
+ * overlay_get_target() retrieves the target offset in the base
+ * device tree of a fragment, no matter how the actual targetting is
+ * done (through a phandle or a path)
+ *
+ * returns:
+ *      the targetted node offset in the base device tree
+ *      Negative error code on error
+ */
+static int overlay_get_target(const void *fdt, const void *fdto,
+			      int fragment, char const **pathp)
+{
+	uint32_t phandle;
+	const char *path = NULL;
+	int path_len = 0, ret;
+
+	/* Try first to do a phandle based lookup */
+	phandle = overlay_get_target_phandle(fdto, fragment);
+	if (phandle == (uint32_t)-1)
+		return -FDT_ERR_BADPHANDLE;
+
+	/* no phandle, try path */
+	if (!phandle) {
+		/* And then a path based lookup */
+		path = fdt_getprop(fdto, fragment, "target-path", &path_len);
+		if (path)
+			ret = fdt_path_offset(fdt, path);
+		else
+			ret = path_len;
+	} else
+		ret = fdt_node_offset_by_phandle(fdt, phandle);
+
+	/*
+	* If we haven't found either a target or a
+	* target-path property in a node that contains a
+	* __overlay__ subnode (we wouldn't be called
+	* otherwise), consider it a improperly written
+	* overlay
+	*/
+	if (ret < 0 && path_len == -FDT_ERR_NOTFOUND)
+		ret = -FDT_ERR_BADOVERLAY;
+
+	/* return on error */
+	if (ret < 0)
+		return ret;
+
+	/* return pointer to path (if available) */
+	if (pathp)
+		*pathp = path ? path : NULL;
+
+	return ret;
+}
+
+/**
+ * overlay_phandle_add_offset - Increases a phandle by an offset
+ * @fdt: Base device tree blob
+ * @node: Device tree overlay blob
+ * @name: Name of the property to modify (phandle or linux,phandle)
+ * @delta: offset to apply
+ *
+ * overlay_phandle_add_offset() increments a node phandle by a given
+ * offset.
+ *
+ * returns:
+ *      0 on success.
+ *      Negative error code on error
+ */
+static int overlay_phandle_add_offset(void *fdt, int node,
+				      const char *name, uint32_t delta)
+{
+	const fdt32_t *val;
+	uint32_t adj_val;
+	int len;
+
+	val = fdt_getprop(fdt, node, name, &len);
+	if (!val)
+		return len;
+
+	if (len != sizeof(*val))
+		return -FDT_ERR_BADPHANDLE;
+
+	adj_val = fdt32_to_cpu(*val);
+	if ((adj_val + delta) < adj_val)
+		return -FDT_ERR_NOPHANDLES;
+
+	adj_val += delta;
+	if (adj_val == (uint32_t)-1)
+		return -FDT_ERR_NOPHANDLES;
+
+	return fdt_setprop_inplace_u32(fdt, node, name, adj_val);
+}
+
+/**
+ * overlay_adjust_node_phandles - Offsets the phandles of a node
+ * @fdto: Device tree overlay blob
+ * @node: Offset of the node we want to adjust
+ * @delta: Offset to shift the phandles of
+ *
+ * overlay_adjust_node_phandles() adds a constant to all the phandles
+ * of a given node. This is mainly use as part of the overlay
+ * application process, when we want to update all the overlay
+ * phandles to not conflict with the overlays of the base device tree.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_adjust_node_phandles(void *fdto, int node,
+					uint32_t delta)
+{
+	int child;
+	int ret;
+
+	ret = overlay_phandle_add_offset(fdto, node, "phandle", delta);
+	if (ret && ret != -FDT_ERR_NOTFOUND)
+		return ret;
+
+	ret = overlay_phandle_add_offset(fdto, node, "linux,phandle", delta);
+	if (ret && ret != -FDT_ERR_NOTFOUND)
+		return ret;
+
+	fdt_for_each_subnode(child, fdto, node) {
+		ret = overlay_adjust_node_phandles(fdto, child, delta);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * overlay_adjust_local_phandles - Adjust the phandles of a whole overlay
+ * @fdto: Device tree overlay blob
+ * @delta: Offset to shift the phandles of
+ *
+ * overlay_adjust_local_phandles() adds a constant to all the
+ * phandles of an overlay. This is mainly use as part of the overlay
+ * application process, when we want to update all the overlay
+ * phandles to not conflict with the overlays of the base device tree.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_adjust_local_phandles(void *fdto, uint32_t delta)
+{
+	/*
+	 * Start adjusting the phandles from the overlay root
+	 */
+	return overlay_adjust_node_phandles(fdto, 0, delta);
+}
+
+/**
+ * overlay_update_local_node_references - Adjust the overlay references
+ * @fdto: Device tree overlay blob
+ * @tree_node: Node offset of the node to operate on
+ * @fixup_node: Node offset of the matching local fixups node
+ * @delta: Offset to shift the phandles of
+ *
+ * overlay_update_local_nodes_references() update the phandles
+ * pointing to a node within the device tree overlay by adding a
+ * constant delta.
+ *
+ * This is mainly used as part of a device tree application process,
+ * where you want the device tree overlays phandles to not conflict
+ * with the ones from the base device tree before merging them.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_update_local_node_references(void *fdto,
+						int tree_node,
+						int fixup_node,
+						uint32_t delta)
+{
+	int fixup_prop;
+	int fixup_child;
+	int ret;
+
+	fdt_for_each_property_offset(fixup_prop, fdto, fixup_node) {
+		const fdt32_t *fixup_val;
+		const char *tree_val;
+		const char *name;
+		int fixup_len;
+		int tree_len;
+		int i;
+
+		fixup_val = fdt_getprop_by_offset(fdto, fixup_prop,
+						  &name, &fixup_len);
+		if (!fixup_val)
+			return fixup_len;
+
+		if (fixup_len % sizeof(uint32_t))
+			return -FDT_ERR_BADOVERLAY;
+
+		tree_val = fdt_getprop(fdto, tree_node, name, &tree_len);
+		if (!tree_val) {
+			if (tree_len == -FDT_ERR_NOTFOUND)
+				return -FDT_ERR_BADOVERLAY;
+
+			return tree_len;
+		}
+
+		for (i = 0; i < (fixup_len / sizeof(uint32_t)); i++) {
+			fdt32_t adj_val;
+			uint32_t poffset;
+
+			poffset = fdt32_to_cpu(fixup_val[i]);
+
+			/*
+			 * phandles to fixup can be unaligned.
+			 *
+			 * Use a memcpy for the architectures that do
+			 * not support unaligned accesses.
+			 */
+			memcpy(&adj_val, tree_val + poffset, sizeof(adj_val));
+
+			adj_val = cpu_to_fdt32(fdt32_to_cpu(adj_val) + delta);
+
+			ret = fdt_setprop_inplace_namelen_partial(fdto,
+								  tree_node,
+								  name,
+								  strlen(name),
+								  poffset,
+								  &adj_val,
+								  sizeof(adj_val));
+			if (ret == -FDT_ERR_NOSPACE)
+				return -FDT_ERR_BADOVERLAY;
+
+			if (ret)
+				return ret;
+		}
+	}
+
+	fdt_for_each_subnode(fixup_child, fdto, fixup_node) {
+		const char *fixup_child_name = fdt_get_name(fdto, fixup_child,
+							    NULL);
+		int tree_child;
+
+		tree_child = fdt_subnode_offset(fdto, tree_node,
+						fixup_child_name);
+		if (tree_child == -FDT_ERR_NOTFOUND)
+			return -FDT_ERR_BADOVERLAY;
+		if (tree_child < 0)
+			return tree_child;
+
+		ret = overlay_update_local_node_references(fdto,
+							   tree_child,
+							   fixup_child,
+							   delta);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * overlay_update_local_references - Adjust the overlay references
+ * @fdto: Device tree overlay blob
+ * @delta: Offset to shift the phandles of
+ *
+ * overlay_update_local_references() update all the phandles pointing
+ * to a node within the device tree overlay by adding a constant
+ * delta to not conflict with the base overlay.
+ *
+ * This is mainly used as part of a device tree application process,
+ * where you want the device tree overlays phandles to not conflict
+ * with the ones from the base device tree before merging them.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_update_local_references(void *fdto, uint32_t delta)
+{
+	int fixups;
+
+	fixups = fdt_path_offset(fdto, "/__local_fixups__");
+	if (fixups < 0) {
+		/* There's no local phandles to adjust, bail out */
+		if (fixups == -FDT_ERR_NOTFOUND)
+			return 0;
+
+		return fixups;
+	}
+
+	/*
+	 * Update our local references from the root of the tree
+	 */
+	return overlay_update_local_node_references(fdto, 0, fixups,
+						    delta);
+}
+
+/**
+ * overlay_fixup_one_phandle - Set an overlay phandle to the base one
+ * @fdt: Base Device Tree blob
+ * @fdto: Device tree overlay blob
+ * @symbols_off: Node offset of the symbols node in the base device tree
+ * @path: Path to a node holding a phandle in the overlay
+ * @path_len: number of path characters to consider
+ * @name: Name of the property holding the phandle reference in the overlay
+ * @name_len: number of name characters to consider
+ * @poffset: Offset within the overlay property where the phandle is stored
+ * @label: Label of the node referenced by the phandle
+ *
+ * overlay_fixup_one_phandle() resolves an overlay phandle pointing to
+ * a node in the base device tree.
+ *
+ * This is part of the device tree overlay application process, when
+ * you want all the phandles in the overlay to point to the actual
+ * base dt nodes.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_fixup_one_phandle(void *fdt, void *fdto,
+				     int symbols_off,
+				     const char *path, uint32_t path_len,
+				     const char *name, uint32_t name_len,
+				     int poffset, const char *label)
+{
+	const char *symbol_path;
+	uint32_t phandle;
+	fdt32_t phandle_prop;
+	int symbol_off, fixup_off;
+	int prop_len;
+
+	if (symbols_off < 0)
+		return symbols_off;
+
+	symbol_path = fdt_getprop(fdt, symbols_off, label,
+				  &prop_len);
+	if (!symbol_path)
+		return prop_len;
+
+	symbol_off = fdt_path_offset(fdt, symbol_path);
+	if (symbol_off < 0)
+		return symbol_off;
+
+	phandle = fdt_get_phandle(fdt, symbol_off);
+	if (!phandle)
+		return -FDT_ERR_NOTFOUND;
+
+	fixup_off = fdt_path_offset_namelen(fdto, path, path_len);
+	if (fixup_off == -FDT_ERR_NOTFOUND)
+		return -FDT_ERR_BADOVERLAY;
+	if (fixup_off < 0)
+		return fixup_off;
+
+	phandle_prop = cpu_to_fdt32(phandle);
+	return fdt_setprop_inplace_namelen_partial(fdto, fixup_off,
+						   name, name_len, poffset,
+						   &phandle_prop,
+						   sizeof(phandle_prop));
+};
+
+/**
+ * overlay_fixup_phandle - Set an overlay phandle to the base one
+ * @fdt: Base Device Tree blob
+ * @fdto: Device tree overlay blob
+ * @symbols_off: Node offset of the symbols node in the base device tree
+ * @property: Property offset in the overlay holding the list of fixups
+ *
+ * overlay_fixup_phandle() resolves all the overlay phandles pointed
+ * to in a __fixups__ property, and updates them to match the phandles
+ * in use in the base device tree.
+ *
+ * This is part of the device tree overlay application process, when
+ * you want all the phandles in the overlay to point to the actual
+ * base dt nodes.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off,
+				 int property)
+{
+	const char *value;
+	const char *label;
+	int len;
+
+	value = fdt_getprop_by_offset(fdto, property,
+				      &label, &len);
+	if (!value) {
+		if (len == -FDT_ERR_NOTFOUND)
+			return -FDT_ERR_INTERNAL;
+
+		return len;
+	}
+
+	do {
+		const char *path, *name, *fixup_end;
+		const char *fixup_str = value;
+		uint32_t path_len, name_len;
+		uint32_t fixup_len;
+		char *sep, *endptr;
+		int poffset, ret;
+
+		fixup_end = memchr(value, '\0', len);
+		if (!fixup_end)
+			return -FDT_ERR_BADOVERLAY;
+		fixup_len = fixup_end - fixup_str;
+
+		len -= fixup_len + 1;
+		value += fixup_len + 1;
+
+		path = fixup_str;
+		sep = memchr(fixup_str, ':', fixup_len);
+		if (!sep || *sep != ':')
+			return -FDT_ERR_BADOVERLAY;
+
+		path_len = sep - path;
+		if (path_len == (fixup_len - 1))
+			return -FDT_ERR_BADOVERLAY;
+
+		fixup_len -= path_len + 1;
+		name = sep + 1;
+		sep = memchr(name, ':', fixup_len);
+		if (!sep || *sep != ':')
+			return -FDT_ERR_BADOVERLAY;
+
+		name_len = sep - name;
+		if (!name_len)
+			return -FDT_ERR_BADOVERLAY;
+
+		poffset = strtoul(sep + 1, &endptr, 10);
+		if ((*endptr != '\0') || (endptr <= (sep + 1)))
+			return -FDT_ERR_BADOVERLAY;
+
+		ret = overlay_fixup_one_phandle(fdt, fdto, symbols_off,
+						path, path_len, name, name_len,
+						poffset, label);
+		if (ret)
+			return ret;
+	} while (len > 0);
+
+	return 0;
+}
+
+/**
+ * overlay_fixup_phandles - Resolve the overlay phandles to the base
+ *                          device tree
+ * @fdt: Base Device Tree blob
+ * @fdto: Device tree overlay blob
+ *
+ * overlay_fixup_phandles() resolves all the overlay phandles pointing
+ * to nodes in the base device tree.
+ *
+ * This is one of the steps of the device tree overlay application
+ * process, when you want all the phandles in the overlay to point to
+ * the actual base dt nodes.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_fixup_phandles(void *fdt, void *fdto)
+{
+	int fixups_off, symbols_off;
+	int property;
+
+	/* We can have overlays without any fixups */
+	fixups_off = fdt_path_offset(fdto, "/__fixups__");
+	if (fixups_off == -FDT_ERR_NOTFOUND)
+		return 0; /* nothing to do */
+	if (fixups_off < 0)
+		return fixups_off;
+
+	/* And base DTs without symbols */
+	symbols_off = fdt_path_offset(fdt, "/__symbols__");
+	if ((symbols_off < 0 && (symbols_off != -FDT_ERR_NOTFOUND)))
+		return symbols_off;
+
+	fdt_for_each_property_offset(property, fdto, fixups_off) {
+		int ret;
+
+		ret = overlay_fixup_phandle(fdt, fdto, symbols_off, property);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * overlay_apply_node - Merges a node into the base device tree
+ * @fdt: Base Device Tree blob
+ * @target: Node offset in the base device tree to apply the fragment to
+ * @fdto: Device tree overlay blob
+ * @node: Node offset in the overlay holding the changes to merge
+ *
+ * overlay_apply_node() merges a node into a target base device tree
+ * node pointed.
+ *
+ * This is part of the final step in the device tree overlay
+ * application process, when all the phandles have been adjusted and
+ * resolved and you just have to merge overlay into the base device
+ * tree.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_apply_node(void *fdt, int target,
+			      void *fdto, int node)
+{
+	int property;
+	int subnode;
+
+	fdt_for_each_property_offset(property, fdto, node) {
+		const char *name;
+		const void *prop;
+		int prop_len;
+		int ret;
+
+		prop = fdt_getprop_by_offset(fdto, property, &name,
+					     &prop_len);
+		if (prop_len == -FDT_ERR_NOTFOUND)
+			return -FDT_ERR_INTERNAL;
+		if (prop_len < 0)
+			return prop_len;
+
+		ret = fdt_setprop(fdt, target, name, prop, prop_len);
+		if (ret)
+			return ret;
+	}
+
+	fdt_for_each_subnode(subnode, fdto, node) {
+		const char *name = fdt_get_name(fdto, subnode, NULL);
+		int nnode;
+		int ret;
+
+		nnode = fdt_add_subnode(fdt, target, name);
+		if (nnode == -FDT_ERR_EXISTS) {
+			nnode = fdt_subnode_offset(fdt, target, name);
+			if (nnode == -FDT_ERR_NOTFOUND)
+				return -FDT_ERR_INTERNAL;
+		}
+
+		if (nnode < 0)
+			return nnode;
+
+		ret = overlay_apply_node(fdt, nnode, fdto, subnode);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * overlay_merge - Merge an overlay into its base device tree
+ * @fdt: Base Device Tree blob
+ * @fdto: Device tree overlay blob
+ *
+ * overlay_merge() merges an overlay into its base device tree.
+ *
+ * This is the next to last step in the device tree overlay application
+ * process, when all the phandles have been adjusted and resolved and
+ * you just have to merge overlay into the base device tree.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_merge(void *fdt, void *fdto)
+{
+	int fragment;
+
+	fdt_for_each_subnode(fragment, fdto, 0) {
+		int overlay;
+		int target;
+		int ret;
+
+		/*
+		 * Each fragments will have an __overlay__ node. If
+		 * they don't, it's not supposed to be merged
+		 */
+		overlay = fdt_subnode_offset(fdto, fragment, "__overlay__");
+		if (overlay == -FDT_ERR_NOTFOUND)
+			continue;
+
+		if (overlay < 0)
+			return overlay;
+
+		target = overlay_get_target(fdt, fdto, fragment, NULL);
+		if (target < 0)
+			return target;
+
+		ret = overlay_apply_node(fdt, target, fdto, overlay);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int get_path_len(const void *fdt, int nodeoffset)
+{
+	int len = 0, namelen;
+	const char *name;
+
+	FDT_CHECK_HEADER(fdt);
+
+	for (;;) {
+		name = fdt_get_name(fdt, nodeoffset, &namelen);
+		if (!name)
+			return namelen;
+
+		/* root? we're done */
+		if (namelen == 0)
+			break;
+
+		nodeoffset = fdt_parent_offset(fdt, nodeoffset);
+		if (nodeoffset < 0)
+			return nodeoffset;
+		len += namelen + 1;
+	}
+
+	/* in case of root pretend it's "/" */
+	if (len == 0)
+		len++;
+	return len;
+}
+
+/**
+ * overlay_symbol_update - Update the symbols of base tree after a merge
+ * @fdt: Base Device Tree blob
+ * @fdto: Device tree overlay blob
+ *
+ * overlay_symbol_update() updates the symbols of the base tree with the
+ * symbols of the applied overlay
+ *
+ * This is the last step in the device tree overlay application
+ * process, allowing the reference of overlay symbols by subsequent
+ * overlay operations.
+ *
+ * returns:
+ *      0 on success
+ *      Negative error code on failure
+ */
+static int overlay_symbol_update(void *fdt, void *fdto)
+{
+	int root_sym, ov_sym, prop, path_len, fragment, target;
+	int len, frag_name_len, ret, rel_path_len;
+	const char *s, *e;
+	const char *path;
+	const char *name;
+	const char *frag_name;
+	const char *rel_path;
+	const char *target_path;
+	char *buf;
+	void *p;
+
+	ov_sym = fdt_subnode_offset(fdto, 0, "__symbols__");
+
+	/* if no overlay symbols exist no problem */
+	if (ov_sym < 0)
+		return 0;
+
+	root_sym = fdt_subnode_offset(fdt, 0, "__symbols__");
+
+	/* it no root symbols exist we should create them */
+	if (root_sym == -FDT_ERR_NOTFOUND)
+		root_sym = fdt_add_subnode(fdt, 0, "__symbols__");
+
+	/* any error is fatal now */
+	if (root_sym < 0)
+		return root_sym;
+
+	/* iterate over each overlay symbol */
+	fdt_for_each_property_offset(prop, fdto, ov_sym) {
+		path = fdt_getprop_by_offset(fdto, prop, &name, &path_len);
+		if (!path)
+			return path_len;
+
+		/* verify it's a string property (terminated by a single \0) */
+		if (path_len < 1 || memchr(path, '\0', path_len) != &path[path_len - 1])
+			return -FDT_ERR_BADVALUE;
+
+		/* keep end marker to avoid strlen() */
+		e = path + path_len;
+
+		/* format: /<fragment-name>/__overlay__/<relative-subnode-path> */
+
+		if (*path != '/')
+			return -FDT_ERR_BADVALUE;
+
+		/* get fragment name first */
+		s = strchr(path + 1, '/');
+		if (!s)
+			return -FDT_ERR_BADOVERLAY;
+
+		frag_name = path + 1;
+		frag_name_len = s - path - 1;
+
+		/* verify format; safe since "s" lies in \0 terminated prop */
+		len = sizeof("/__overlay__/") - 1;
+		if ((e - s) < len || memcmp(s, "/__overlay__/", len))
+			return -FDT_ERR_BADOVERLAY;
+
+		rel_path = s + len;
+		rel_path_len = e - rel_path;
+
+		/* find the fragment index in which the symbol lies */
+		ret = fdt_subnode_offset_namelen(fdto, 0, frag_name,
+					       frag_name_len);
+		/* not found? */
+		if (ret < 0)
+			return -FDT_ERR_BADOVERLAY;
+		fragment = ret;
+
+		/* an __overlay__ subnode must exist */
+		ret = fdt_subnode_offset(fdto, fragment, "__overlay__");
+		if (ret < 0)
+			return -FDT_ERR_BADOVERLAY;
+
+		/* get the target of the fragment */
+		ret = overlay_get_target(fdt, fdto, fragment, &target_path);
+		if (ret < 0)
+			return ret;
+		target = ret;
+
+		/* if we have a target path use */
+		if (!target_path) {
+			ret = get_path_len(fdt, target);
+			if (ret < 0)
+				return ret;
+			len = ret;
+		} else {
+			len = strlen(target_path);
+		}
+
+		ret = fdt_setprop_placeholder(fdt, root_sym, name,
+				len + (len > 1) + rel_path_len + 1, &p);
+		if (ret < 0)
+			return ret;
+
+		if (!target_path) {
+			/* again in case setprop_placeholder changed it */
+			ret = overlay_get_target(fdt, fdto, fragment, &target_path);
+			if (ret < 0)
+				return ret;
+			target = ret;
+		}
+
+		buf = p;
+		if (len > 1) { /* target is not root */
+			if (!target_path) {
+				ret = fdt_get_path(fdt, target, buf, len + 1);
+				if (ret < 0)
+					return ret;
+			} else
+				memcpy(buf, target_path, len + 1);
+
+		} else
+			len--;
+
+		buf[len] = '/';
+		memcpy(buf + len + 1, rel_path, rel_path_len);
+		buf[len + 1 + rel_path_len] = '\0';
+	}
+
+	return 0;
+}
+
+int fdt_overlay_apply(void *fdt, void *fdto)
+{
+	uint32_t delta = fdt_get_max_phandle(fdt);
+	int ret;
+
+	FDT_CHECK_HEADER(fdt);
+	FDT_CHECK_HEADER(fdto);
+
+	ret = overlay_adjust_local_phandles(fdto, delta);
+	if (ret)
+		goto err;
+
+	ret = overlay_update_local_references(fdto, delta);
+	if (ret)
+		goto err;
+
+	ret = overlay_fixup_phandles(fdt, fdto);
+	if (ret)
+		goto err;
+
+	ret = overlay_merge(fdt, fdto);
+	if (ret)
+		goto err;
+
+	ret = overlay_symbol_update(fdt, fdto);
+	if (ret)
+		goto err;
+
+	/*
+	 * The overlay has been damaged, erase its magic.
+	 */
+	fdt_set_magic(fdto, ~0);
+
+	return 0;
+
+err:
+	/*
+	 * The overlay might have been damaged, erase its magic.
+	 */
+	fdt_set_magic(fdto, ~0);
+
+	/*
+	 * The base device tree might have been damaged, erase its
+	 * magic.
+	 */
+	fdt_set_magic(fdt, ~0);
+
+	return ret;
+}
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_ro.c device-tree-compiler-1.4.5/libfdt/fdt_ro.c
--- device-tree-compiler-1.4.2/libfdt/fdt_ro.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_ro.c	2017-09-27 10:00:10.000000000 +0000
@@ -60,7 +60,7 @@
 {
 	const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1);
 
-	if (! p)
+	if (!p)
 		/* short match */
 		return 0;
 
@@ -327,7 +327,7 @@
 	const struct fdt_property *prop;
 
 	prop = fdt_get_property_namelen(fdt, nodeoffset, name, namelen, lenp);
-	if (! prop)
+	if (!prop)
 		return NULL;
 
 	return prop->data;
@@ -571,7 +571,7 @@
 
 	list = fdt_getprop(fdt, nodeoffset, property, &length);
 	if (!list)
-		return -length;
+		return length;
 
 	end = list + length;
 
@@ -597,7 +597,7 @@
 
 	list = fdt_getprop(fdt, nodeoffset, property, &length);
 	if (!list)
-		return -length;
+		return length;
 
 	len = strlen(string) + 1;
 	end = list + length;
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_rw.c device-tree-compiler-1.4.5/libfdt/fdt_rw.c
--- device-tree-compiler-1.4.2/libfdt/fdt_rw.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_rw.c	2017-09-27 10:00:10.000000000 +0000
@@ -207,7 +207,7 @@
 	int err;
 
 	*prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
-	if (! (*prop))
+	if (!*prop)
 		return oldlen;
 
 	if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),
@@ -269,8 +269,8 @@
 	return 0;
 }
 
-int fdt_setprop(void *fdt, int nodeoffset, const char *name,
-		const void *val, int len)
+int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,
+			    int len, void **prop_data)
 {
 	struct fdt_property *prop;
 	int err;
@@ -283,7 +283,22 @@
 	if (err)
 		return err;
 
-	memcpy(prop->data, val, len);
+	*prop_data = prop->data;
+	return 0;
+}
+
+int fdt_setprop(void *fdt, int nodeoffset, const char *name,
+		const void *val, int len)
+{
+	void *prop_data;
+	int err;
+
+	err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data);
+	if (err)
+		return err;
+
+	if (len)
+		memcpy(prop_data, val, len);
 	return 0;
 }
 
@@ -322,7 +337,7 @@
 	FDT_RW_CHECK_HEADER(fdt);
 
 	prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
-	if (! prop)
+	if (!prop)
 		return len;
 
 	proplen = sizeof(*prop) + FDT_TAGALIGN(len);
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_strerror.c device-tree-compiler-1.4.5/libfdt/fdt_strerror.c
--- device-tree-compiler-1.4.2/libfdt/fdt_strerror.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_strerror.c	2017-09-27 10:00:10.000000000 +0000
@@ -69,6 +69,7 @@
 
 	FDT_ERRTABENT(FDT_ERR_BADOFFSET),
 	FDT_ERRTABENT(FDT_ERR_BADPATH),
+	FDT_ERRTABENT(FDT_ERR_BADPHANDLE),
 	FDT_ERRTABENT(FDT_ERR_BADSTATE),
 
 	FDT_ERRTABENT(FDT_ERR_TRUNCATED),
@@ -76,6 +77,11 @@
 	FDT_ERRTABENT(FDT_ERR_BADVERSION),
 	FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE),
 	FDT_ERRTABENT(FDT_ERR_BADLAYOUT),
+	FDT_ERRTABENT(FDT_ERR_INTERNAL),
+	FDT_ERRTABENT(FDT_ERR_BADNCELLS),
+	FDT_ERRTABENT(FDT_ERR_BADVALUE),
+	FDT_ERRTABENT(FDT_ERR_BADOVERLAY),
+	FDT_ERRTABENT(FDT_ERR_NOPHANDLES),
 };
 #define FDT_ERRTABSIZE	(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))
 
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_sw.c device-tree-compiler-1.4.5/libfdt/fdt_sw.c
--- device-tree-compiler-1.4.2/libfdt/fdt_sw.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_sw.c	2017-09-27 10:00:10.000000000 +0000
@@ -220,7 +220,7 @@
 	return offset;
 }
 
-int fdt_property(void *fdt, const char *name, const void *val, int len)
+int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)
 {
 	struct fdt_property *prop;
 	int nameoff;
@@ -238,7 +238,19 @@
 	prop->tag = cpu_to_fdt32(FDT_PROP);
 	prop->nameoff = cpu_to_fdt32(nameoff);
 	prop->len = cpu_to_fdt32(len);
-	memcpy(prop->data, val, len);
+	*valp = prop->data;
+	return 0;
+}
+
+int fdt_property(void *fdt, const char *name, const void *val, int len)
+{
+	void *ptr;
+	int ret;
+
+	ret = fdt_property_placeholder(fdt, name, len, &ptr);
+	if (ret)
+		return ret;
+	memcpy(ptr, val, len);
 	return 0;
 }
 
diff -Nru device-tree-compiler-1.4.2/libfdt/fdt_wip.c device-tree-compiler-1.4.5/libfdt/fdt_wip.c
--- device-tree-compiler-1.4.2/libfdt/fdt_wip.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/fdt_wip.c	2017-09-27 10:00:10.000000000 +0000
@@ -82,7 +82,7 @@
 	int proplen;
 
 	propval = fdt_getprop(fdt, nodeoffset, name, &proplen);
-	if (! propval)
+	if (!propval)
 		return proplen;
 
 	if (proplen != len)
@@ -107,7 +107,7 @@
 	int len;
 
 	prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
-	if (! prop)
+	if (!prop)
 		return len;
 
 	_fdt_nop_region(prop, len + sizeof(*prop));
diff -Nru device-tree-compiler-1.4.2/libfdt/libfdt_env.h device-tree-compiler-1.4.5/libfdt/libfdt_env.h
--- device-tree-compiler-1.4.2/libfdt/libfdt_env.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/libfdt_env.h	2017-09-27 10:00:10.000000000 +0000
@@ -54,19 +54,20 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef __CHECKER__
-#define __force __attribute__((force))
-#define __bitwise __attribute__((bitwise))
+#define FDT_FORCE __attribute__((force))
+#define FDT_BITWISE __attribute__((bitwise))
 #else
-#define __force
-#define __bitwise
+#define FDT_FORCE
+#define FDT_BITWISE
 #endif
 
-typedef uint16_t __bitwise fdt16_t;
-typedef uint32_t __bitwise fdt32_t;
-typedef uint64_t __bitwise fdt64_t;
+typedef uint16_t FDT_BITWISE fdt16_t;
+typedef uint32_t FDT_BITWISE fdt32_t;
+typedef uint64_t FDT_BITWISE fdt64_t;
 
 #define EXTRACT_BYTE(x, n)	((unsigned long long)((uint8_t *)&x)[n])
 #define CPU_TO_FDT16(x) ((EXTRACT_BYTE(x, 0) << 8) | EXTRACT_BYTE(x, 1))
@@ -79,29 +80,29 @@
 
 static inline uint16_t fdt16_to_cpu(fdt16_t x)
 {
-	return (__force uint16_t)CPU_TO_FDT16(x);
+	return (FDT_FORCE uint16_t)CPU_TO_FDT16(x);
 }
 static inline fdt16_t cpu_to_fdt16(uint16_t x)
 {
-	return (__force fdt16_t)CPU_TO_FDT16(x);
+	return (FDT_FORCE fdt16_t)CPU_TO_FDT16(x);
 }
 
 static inline uint32_t fdt32_to_cpu(fdt32_t x)
 {
-	return (__force uint32_t)CPU_TO_FDT32(x);
+	return (FDT_FORCE uint32_t)CPU_TO_FDT32(x);
 }
 static inline fdt32_t cpu_to_fdt32(uint32_t x)
 {
-	return (__force fdt32_t)CPU_TO_FDT32(x);
+	return (FDT_FORCE fdt32_t)CPU_TO_FDT32(x);
 }
 
 static inline uint64_t fdt64_to_cpu(fdt64_t x)
 {
-	return (__force uint64_t)CPU_TO_FDT64(x);
+	return (FDT_FORCE uint64_t)CPU_TO_FDT64(x);
 }
 static inline fdt64_t cpu_to_fdt64(uint64_t x)
 {
-	return (__force fdt64_t)CPU_TO_FDT64(x);
+	return (FDT_FORCE fdt64_t)CPU_TO_FDT64(x);
 }
 #undef CPU_TO_FDT64
 #undef CPU_TO_FDT32
diff -Nru device-tree-compiler-1.4.2/libfdt/libfdt.h device-tree-compiler-1.4.5/libfdt/libfdt.h
--- device-tree-compiler-1.4.2/libfdt/libfdt.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/libfdt.h	2017-09-27 10:00:10.000000000 +0000
@@ -61,7 +61,7 @@
 #define FDT_ERR_NOTFOUND	1
 	/* FDT_ERR_NOTFOUND: The requested node or property does not exist */
 #define FDT_ERR_EXISTS		2
-	/* FDT_ERR_EXISTS: Attemped to create a node or property which
+	/* FDT_ERR_EXISTS: Attempted to create a node or property which
 	 * already exists */
 #define FDT_ERR_NOSPACE		3
 	/* FDT_ERR_NOSPACE: Operation needed to expand the device
@@ -79,8 +79,10 @@
 	 * (e.g. missing a leading / for a function which requires an
 	 * absolute path) */
 #define FDT_ERR_BADPHANDLE	6
-	/* FDT_ERR_BADPHANDLE: Function was passed an invalid phandle
-	 * value.  phandle values of 0 and -1 are not permitted. */
+	/* FDT_ERR_BADPHANDLE: Function was passed an invalid phandle.
+	 * This can be caused either by an invalid phandle property
+	 * length, or the phandle value was either 0 or -1, which are
+	 * not permitted. */
 #define FDT_ERR_BADSTATE	7
 	/* FDT_ERR_BADSTATE: Function was passed an incomplete device
 	 * tree created by the sequential-write functions, which is
@@ -126,13 +128,24 @@
 	 * value. For example: a property expected to contain a string list
 	 * is not NUL-terminated within the length of its value. */
 
-#define FDT_ERR_MAX		15
+#define FDT_ERR_BADOVERLAY	16
+	/* FDT_ERR_BADOVERLAY: The device tree overlay, while
+	 * correctly structured, cannot be applied due to some
+	 * unexpected or missing value, property or node. */
+
+#define FDT_ERR_NOPHANDLES	17
+	/* FDT_ERR_NOPHANDLES: The device tree doesn't have any
+	 * phandle available anymore without causing an overflow */
+
+#define FDT_ERR_MAX		17
 
 /**********************************************************************/
 /* Low-level functions (you probably don't need these)                */
 /**********************************************************************/
 
+#ifndef SWIG /* This function is not useful in Python */
 const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int checklen);
+#endif
 static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
 {
 	return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
@@ -199,7 +212,6 @@
 /**********************************************************************/
 /* General functions                                                  */
 /**********************************************************************/
-
 #define fdt_get_header(fdt, field) \
 	(fdt32_to_cpu(((const struct fdt_header *)(fdt))->field))
 #define fdt_magic(fdt)			(fdt_get_header(fdt, magic))
@@ -343,8 +355,10 @@
  * useful for finding subnodes based on a portion of a larger string,
  * such as a full path.
  */
+#ifndef SWIG /* Not available in Python */
 int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
 			       const char *name, int namelen);
+#endif
 /**
  * fdt_subnode_offset - find a subnode of a given node
  * @fdt: pointer to the device tree blob
@@ -380,7 +394,9 @@
  * Identical to fdt_path_offset(), but only consider the first namelen
  * characters of path as the path name.
  */
+#ifndef SWIG /* Not available in Python */
 int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen);
+#endif
 
 /**
  * fdt_path_offset - find a tree node by its full path
@@ -539,10 +555,12 @@
  * Identical to fdt_get_property(), but only examine the first namelen
  * characters of name for matching the property name.
  */
+#ifndef SWIG /* Not available in Python */
 const struct fdt_property *fdt_get_property_namelen(const void *fdt,
 						    int nodeoffset,
 						    const char *name,
 						    int namelen, int *lenp);
+#endif
 
 /**
  * fdt_get_property - find a given property in a given node
@@ -613,8 +631,10 @@
  *		-FDT_ERR_BADSTRUCTURE,
  *		-FDT_ERR_TRUNCATED, standard meanings
  */
+#ifndef SWIG /* This function is not useful in Python */
 const void *fdt_getprop_by_offset(const void *fdt, int offset,
 				  const char **namep, int *lenp);
+#endif
 
 /**
  * fdt_getprop_namelen - get property value based on substring
@@ -627,6 +647,7 @@
  * Identical to fdt_getprop(), but only examine the first namelen
  * characters of name for matching the property name.
  */
+#ifndef SWIG /* Not available in Python */
 const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
 				const char *name, int namelen, int *lenp);
 static inline void *fdt_getprop_namelen_w(void *fdt, int nodeoffset,
@@ -636,6 +657,7 @@
 	return (void *)(uintptr_t)fdt_getprop_namelen(fdt, nodeoffset, name,
 						      namelen, lenp);
 }
+#endif
 
 /**
  * fdt_getprop - retrieve the value of a given property
@@ -696,11 +718,13 @@
  * Identical to fdt_get_alias(), but only examine the first namelen
  * characters of name for matching the alias name.
  */
+#ifndef SWIG /* Not available in Python */
 const char *fdt_get_alias_namelen(const void *fdt,
 				  const char *name, int namelen);
+#endif
 
 /**
- * fdt_get_alias - retreive the path referenced by a given alias
+ * fdt_get_alias - retrieve the path referenced by a given alias
  * @fdt: pointer to the device tree blob
  * @name: name of the alias th look up
  *
@@ -1095,10 +1119,12 @@
  * of the name. It is useful when you want to manipulate only one value of
  * an array and you have a string that doesn't end with \0.
  */
+#ifndef SWIG /* Not available in Python */
 int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset,
 					const char *name, int namelen,
 					uint32_t idx, const void *val,
 					int len);
+#endif
 
 /**
  * fdt_setprop_inplace - change a property's value, but not its size
@@ -1128,8 +1154,10 @@
  *	-FDT_ERR_BADSTRUCTURE,
  *	-FDT_ERR_TRUNCATED, standard meanings
  */
+#ifndef SWIG /* Not available in Python */
 int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
 			const void *val, int len);
+#endif
 
 /**
  * fdt_setprop_inplace_u32 - change the value of a 32-bit integer property
@@ -1286,6 +1314,22 @@
 {
 	return fdt_property_u32(fdt, name, val);
 }
+
+/**
+ * fdt_property_placeholder - add a new property and return a ptr to its value
+ *
+ * @fdt: pointer to the device tree blob
+ * @name: name of property to add
+ * @len: length of property value in bytes
+ * @valp: returns a pointer to where where the value should be placed
+ *
+ * returns:
+ *	0, on success
+ *	-FDT_ERR_BADMAGIC,
+ *	-FDT_ERR_NOSPACE, standard meanings
+ */
+int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp);
+
 #define fdt_property_string(fdt, name, str) \
 	fdt_property(fdt, name, str, strlen(str)+1)
 int fdt_end_node(void *fdt);
@@ -1405,6 +1449,37 @@
 		const void *val, int len);
 
 /**
+ * fdt_setprop _placeholder - allocate space for a property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @len: length of the property value
+ * @prop_data: return pointer to property data
+ *
+ * fdt_setprop_placeholer() allocates the named property in the given node.
+ * If the property exists it is resized. In either case a pointer to the
+ * property data is returned.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *	0, on success
+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *		contain the new property value
+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *	-FDT_ERR_BADLAYOUT,
+ *	-FDT_ERR_BADMAGIC,
+ *	-FDT_ERR_BADVERSION,
+ *	-FDT_ERR_BADSTATE,
+ *	-FDT_ERR_BADSTRUCTURE,
+ *	-FDT_ERR_BADLAYOUT,
+ *	-FDT_ERR_TRUNCATED, standard meanings
+ */
+int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,
+			    int len, void **prop_data);
+
+/**
  * fdt_setprop_u32 - set a property to a 32-bit integer
  * @fdt: pointer to the device tree blob
  * @nodeoffset: offset of the node whose property to change
@@ -1516,6 +1591,36 @@
 #define fdt_setprop_string(fdt, nodeoffset, name, str) \
 	fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
 
+
+/**
+ * fdt_setprop_empty - set a property to an empty value
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ *
+ * fdt_setprop_empty() sets the value of the named property in the
+ * given node to an empty (zero length) value, or creates a new empty
+ * property if it does not already exist.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *	0, on success
+ *	-FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *		contain the new property value
+ *	-FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *	-FDT_ERR_BADLAYOUT,
+ *	-FDT_ERR_BADMAGIC,
+ *	-FDT_ERR_BADVERSION,
+ *	-FDT_ERR_BADSTATE,
+ *	-FDT_ERR_BADSTRUCTURE,
+ *	-FDT_ERR_BADLAYOUT,
+ *	-FDT_ERR_TRUNCATED, standard meanings
+ */
+#define fdt_setprop_empty(fdt, nodeoffset, name) \
+	fdt_setprop((fdt), (nodeoffset), (name), NULL, 0)
+
 /**
  * fdt_appendprop - append to or create a property
  * @fdt: pointer to the device tree blob
@@ -1693,8 +1798,10 @@
  * creating subnodes based on a portion of a larger string, such as a
  * full path.
  */
+#ifndef SWIG /* Not available in Python */
 int fdt_add_subnode_namelen(void *fdt, int parentoffset,
 			    const char *name, int namelen);
+#endif
 
 /**
  * fdt_add_subnode - creates a new node
@@ -1752,6 +1859,37 @@
  */
 int fdt_del_node(void *fdt, int nodeoffset);
 
+/**
+ * fdt_overlay_apply - Applies a DT overlay on a base DT
+ * @fdt: pointer to the base device tree blob
+ * @fdto: pointer to the device tree overlay blob
+ *
+ * fdt_overlay_apply() will apply the given device tree overlay on the
+ * given base device tree.
+ *
+ * Expect the base device tree to be modified, even if the function
+ * returns an error.
+ *
+ * returns:
+ *	0, on success
+ *	-FDT_ERR_NOSPACE, there's not enough space in the base device tree
+ *	-FDT_ERR_NOTFOUND, the overlay points to some inexistant nodes or
+ *		properties in the base DT
+ *	-FDT_ERR_BADPHANDLE,
+ *	-FDT_ERR_BADOVERLAY,
+ *	-FDT_ERR_NOPHANDLES,
+ *	-FDT_ERR_INTERNAL,
+ *	-FDT_ERR_BADLAYOUT,
+ *	-FDT_ERR_BADMAGIC,
+ *	-FDT_ERR_BADOFFSET,
+ *	-FDT_ERR_BADPATH,
+ *	-FDT_ERR_BADVERSION,
+ *	-FDT_ERR_BADSTRUCTURE,
+ *	-FDT_ERR_BADSTATE,
+ *	-FDT_ERR_TRUNCATED, standard meanings
+ */
+int fdt_overlay_apply(void *fdt, void *fdto);
+
 /**********************************************************************/
 /* Debugging / informational functions                                */
 /**********************************************************************/
diff -Nru device-tree-compiler-1.4.2/libfdt/Makefile.libfdt device-tree-compiler-1.4.5/libfdt/Makefile.libfdt
--- device-tree-compiler-1.4.2/libfdt/Makefile.libfdt	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/Makefile.libfdt	2017-09-27 10:00:10.000000000 +0000
@@ -7,5 +7,5 @@
 LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h
 LIBFDT_VERSION = version.lds
 LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \
-	fdt_addresses.c
+	fdt_addresses.c fdt_overlay.c
 LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
diff -Nru device-tree-compiler-1.4.2/libfdt/version.lds device-tree-compiler-1.4.5/libfdt/version.lds
--- device-tree-compiler-1.4.2/libfdt/version.lds	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/libfdt/version.lds	2017-09-27 10:00:10.000000000 +0000
@@ -61,6 +61,7 @@
 		fdt_size_cells;
 		fdt_stringlist_contains;
 		fdt_resize;
+		fdt_overlay_apply;
 
 	local:
 		*;
diff -Nru device-tree-compiler-1.4.2/livetree.c device-tree-compiler-1.4.5/livetree.c
--- device-tree-compiler-1.4.2/livetree.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/livetree.c	2017-09-27 10:00:10.000000000 +0000
@@ -204,7 +204,7 @@
 			}
 		}
 
-		/* if no collision occured, add child to the old node. */
+		/* if no collision occurred, add child to the old node. */
 		if (new_child)
 			add_child(old_node, new_child);
 	}
@@ -242,7 +242,7 @@
 	struct property *prop = node->proplist;
 
 	while (prop) {
-		if (!strcmp(prop->name, name)) {
+		if (streq(prop->name, name)) {
 			delete_property(prop);
 			return;
 		}
@@ -275,7 +275,7 @@
 	struct node *node = parent->children;
 
 	while (node) {
-		if (!strcmp(node->name, name)) {
+		if (streq(node->name, name)) {
 			delete_node(node);
 			return;
 		}
@@ -296,14 +296,31 @@
 	delete_labels(&node->labels);
 }
 
+void append_to_property(struct node *node,
+				    char *name, const void *data, int len)
+{
+	struct data d;
+	struct property *p;
+
+	p = get_property(node, name);
+	if (p) {
+		d = data_append_data(p->val, data, len);
+		p->val = d;
+	} else {
+		d = data_append_data(empty_data, data, len);
+		p = build_property(name, d);
+		add_property(node, p);
+	}
+}
+
 struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size)
 {
 	struct reserve_info *new = xmalloc(sizeof(*new));
 
 	memset(new, 0, sizeof(*new));
 
-	new->re.address = address;
-	new->re.size = size;
+	new->address = address;
+	new->size = size;
 
 	return new;
 }
@@ -335,17 +352,19 @@
 	return list;
 }
 
-struct boot_info *build_boot_info(struct reserve_info *reservelist,
-				  struct node *tree, uint32_t boot_cpuid_phys)
-{
-	struct boot_info *bi;
-
-	bi = xmalloc(sizeof(*bi));
-	bi->reservelist = reservelist;
-	bi->dt = tree;
-	bi->boot_cpuid_phys = boot_cpuid_phys;
+struct dt_info *build_dt_info(unsigned int dtsflags,
+			      struct reserve_info *reservelist,
+			      struct node *tree, uint32_t boot_cpuid_phys)
+{
+	struct dt_info *dti;
+
+	dti = xmalloc(sizeof(*dti));
+	dti->dtsflags = dtsflags;
+	dti->reservelist = reservelist;
+	dti->dt = tree;
+	dti->boot_cpuid_phys = boot_cpuid_phys;
 
-	return bi;
+	return dti;
 }
 
 /*
@@ -374,7 +393,13 @@
 cell_t propval_cell(struct property *prop)
 {
 	assert(prop->val.len == sizeof(cell_t));
-	return fdt32_to_cpu(*((cell_t *)prop->val.val));
+	return fdt32_to_cpu(*((fdt32_t *)prop->val.val));
+}
+
+cell_t propval_cell_n(struct property *prop, int n)
+{
+	assert(prop->val.len / sizeof(cell_t) >= n);
+	return fdt32_to_cpu(*((fdt32_t *)prop->val.val + n));
 }
 
 struct property *get_property_by_label(struct node *tree, const char *label,
@@ -459,7 +484,8 @@
 	p = strchr(path, '/');
 
 	for_each_child(tree, child) {
-		if (p && strneq(path, child->name, p-path))
+		if (p && (strlen(child->name) == p-path) &&
+				strneq(path, child->name, p-path))
 			return get_node_by_path(child, p+1);
 		else if (!p && streq(path, child->name))
 			return child;
@@ -580,24 +606,24 @@
 	a = *((const struct reserve_info * const *)ax);
 	b = *((const struct reserve_info * const *)bx);
 
-	if (a->re.address < b->re.address)
+	if (a->address < b->address)
 		return -1;
-	else if (a->re.address > b->re.address)
+	else if (a->address > b->address)
 		return 1;
-	else if (a->re.size < b->re.size)
+	else if (a->size < b->size)
 		return -1;
-	else if (a->re.size > b->re.size)
+	else if (a->size > b->size)
 		return 1;
 	else
 		return 0;
 }
 
-static void sort_reserve_entries(struct boot_info *bi)
+static void sort_reserve_entries(struct dt_info *dti)
 {
 	struct reserve_info *ri, **tbl;
 	int n = 0, i = 0;
 
-	for (ri = bi->reservelist;
+	for (ri = dti->reservelist;
 	     ri;
 	     ri = ri->next)
 		n++;
@@ -607,14 +633,14 @@
 
 	tbl = xmalloc(n * sizeof(*tbl));
 
-	for (ri = bi->reservelist;
+	for (ri = dti->reservelist;
 	     ri;
 	     ri = ri->next)
 		tbl[i++] = ri;
 
 	qsort(tbl, n, sizeof(*tbl), cmp_reserve_info);
 
-	bi->reservelist = tbl[0];
+	dti->reservelist = tbl[0];
 	for (i = 0; i < (n-1); i++)
 		tbl[i]->next = tbl[i+1];
 	tbl[n-1]->next = NULL;
@@ -704,8 +730,258 @@
 		sort_node(c);
 }
 
-void sort_tree(struct boot_info *bi)
+void sort_tree(struct dt_info *dti)
+{
+	sort_reserve_entries(dti);
+	sort_node(dti->dt);
+}
+
+/* utility helper to avoid code duplication */
+static struct node *build_and_name_child_node(struct node *parent, char *name)
+{
+	struct node *node;
+
+	node = build_node(NULL, NULL);
+	name_node(node, xstrdup(name));
+	add_child(parent, node);
+
+	return node;
+}
+
+static struct node *build_root_node(struct node *dt, char *name)
+{
+	struct node *an;
+
+	an = get_subnode(dt, name);
+	if (!an)
+		an = build_and_name_child_node(dt, name);
+
+	if (!an)
+		die("Could not build root node /%s\n", name);
+
+	return an;
+}
+
+static bool any_label_tree(struct dt_info *dti, struct node *node)
+{
+	struct node *c;
+
+	if (node->labels)
+		return true;
+
+	for_each_child(node, c)
+		if (any_label_tree(dti, c))
+			return true;
+
+	return false;
+}
+
+static void generate_label_tree_internal(struct dt_info *dti,
+					 struct node *an, struct node *node,
+					 bool allocph)
+{
+	struct node *dt = dti->dt;
+	struct node *c;
+	struct property *p;
+	struct label *l;
+
+	/* if there are labels */
+	if (node->labels) {
+
+		/* now add the label in the node */
+		for_each_label(node->labels, l) {
+
+			/* check whether the label already exists */
+			p = get_property(an, l->label);
+			if (p) {
+				fprintf(stderr, "WARNING: label %s already"
+					" exists in /%s", l->label,
+					an->name);
+				continue;
+			}
+
+			/* insert it */
+			p = build_property(l->label,
+				data_copy_mem(node->fullpath,
+						strlen(node->fullpath) + 1));
+			add_property(an, p);
+		}
+
+		/* force allocation of a phandle for this node */
+		if (allocph)
+			(void)get_node_phandle(dt, node);
+	}
+
+	for_each_child(node, c)
+		generate_label_tree_internal(dti, an, c, allocph);
+}
+
+static bool any_fixup_tree(struct dt_info *dti, struct node *node)
+{
+	struct node *c;
+	struct property *prop;
+	struct marker *m;
+
+	for_each_property(node, prop) {
+		m = prop->val.markers;
+		for_each_marker_of_type(m, REF_PHANDLE) {
+			if (!get_node_by_ref(dti->dt, m->ref))
+				return true;
+		}
+	}
+
+	for_each_child(node, c) {
+		if (any_fixup_tree(dti, c))
+			return true;
+	}
+
+	return false;
+}
+
+static void add_fixup_entry(struct dt_info *dti, struct node *fn,
+			    struct node *node, struct property *prop,
+			    struct marker *m)
 {
-	sort_reserve_entries(bi);
-	sort_node(bi->dt);
+	char *entry;
+
+	/* m->ref can only be a REF_PHANDLE, but check anyway */
+	assert(m->type == REF_PHANDLE);
+
+	/* there shouldn't be any ':' in the arguments */
+	if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
+		die("arguments should not contain ':'\n");
+
+	xasprintf(&entry, "%s:%s:%u",
+			node->fullpath, prop->name, m->offset);
+	append_to_property(fn, m->ref, entry, strlen(entry) + 1);
+
+	free(entry);
+}
+
+static void generate_fixups_tree_internal(struct dt_info *dti,
+					  struct node *fn,
+					  struct node *node)
+{
+	struct node *dt = dti->dt;
+	struct node *c;
+	struct property *prop;
+	struct marker *m;
+	struct node *refnode;
+
+	for_each_property(node, prop) {
+		m = prop->val.markers;
+		for_each_marker_of_type(m, REF_PHANDLE) {
+			refnode = get_node_by_ref(dt, m->ref);
+			if (!refnode)
+				add_fixup_entry(dti, fn, node, prop, m);
+		}
+	}
+
+	for_each_child(node, c)
+		generate_fixups_tree_internal(dti, fn, c);
+}
+
+static bool any_local_fixup_tree(struct dt_info *dti, struct node *node)
+{
+	struct node *c;
+	struct property *prop;
+	struct marker *m;
+
+	for_each_property(node, prop) {
+		m = prop->val.markers;
+		for_each_marker_of_type(m, REF_PHANDLE) {
+			if (get_node_by_ref(dti->dt, m->ref))
+				return true;
+		}
+	}
+
+	for_each_child(node, c) {
+		if (any_local_fixup_tree(dti, c))
+			return true;
+	}
+
+	return false;
+}
+
+static void add_local_fixup_entry(struct dt_info *dti,
+		struct node *lfn, struct node *node,
+		struct property *prop, struct marker *m,
+		struct node *refnode)
+{
+	struct node *wn, *nwn;	/* local fixup node, walk node, new */
+	fdt32_t value_32;
+	char **compp;
+	int i, depth;
+
+	/* walk back retreiving depth */
+	depth = 0;
+	for (wn = node; wn; wn = wn->parent)
+		depth++;
+
+	/* allocate name array */
+	compp = xmalloc(sizeof(*compp) * depth);
+
+	/* store names in the array */
+	for (wn = node, i = depth - 1; wn; wn = wn->parent, i--)
+		compp[i] = wn->name;
+
+	/* walk the path components creating nodes if they don't exist */
+	for (wn = lfn, i = 1; i < depth; i++, wn = nwn) {
+		/* if no node exists, create it */
+		nwn = get_subnode(wn, compp[i]);
+		if (!nwn)
+			nwn = build_and_name_child_node(wn, compp[i]);
+	}
+
+	free(compp);
+
+	value_32 = cpu_to_fdt32(m->offset);
+	append_to_property(wn, prop->name, &value_32, sizeof(value_32));
+}
+
+static void generate_local_fixups_tree_internal(struct dt_info *dti,
+						struct node *lfn,
+						struct node *node)
+{
+	struct node *dt = dti->dt;
+	struct node *c;
+	struct property *prop;
+	struct marker *m;
+	struct node *refnode;
+
+	for_each_property(node, prop) {
+		m = prop->val.markers;
+		for_each_marker_of_type(m, REF_PHANDLE) {
+			refnode = get_node_by_ref(dt, m->ref);
+			if (refnode)
+				add_local_fixup_entry(dti, lfn, node, prop, m, refnode);
+		}
+	}
+
+	for_each_child(node, c)
+		generate_local_fixups_tree_internal(dti, lfn, c);
+}
+
+void generate_label_tree(struct dt_info *dti, char *name, bool allocph)
+{
+	if (!any_label_tree(dti, dti->dt))
+		return;
+	generate_label_tree_internal(dti, build_root_node(dti->dt, name),
+				     dti->dt, allocph);
+}
+
+void generate_fixups_tree(struct dt_info *dti, char *name)
+{
+	if (!any_fixup_tree(dti, dti->dt))
+		return;
+	generate_fixups_tree_internal(dti, build_root_node(dti->dt, name),
+				      dti->dt);
+}
+
+void generate_local_fixups_tree(struct dt_info *dti, char *name)
+{
+	if (!any_local_fixup_tree(dti, dti->dt))
+		return;
+	generate_local_fixups_tree_internal(dti, build_root_node(dti->dt, name),
+					    dti->dt);
 }
diff -Nru device-tree-compiler-1.4.2/Makefile device-tree-compiler-1.4.5/Makefile
--- device-tree-compiler-1.4.2/Makefile	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/Makefile	2017-09-27 10:00:10.000000000 +0000
@@ -10,7 +10,7 @@
 #
 VERSION = 1
 PATCHLEVEL = 4
-SUBLEVEL = 2
+SUBLEVEL = 5
 EXTRAVERSION =
 LOCAL_VERSION =
 CONFIG_LOCALVERSION =
@@ -18,10 +18,12 @@
 CPPFLAGS = -I libfdt -I .
 WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
-CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS)
 
 BISON = bison
 LEX = flex
+SWIG = swig
+PKG_CONFIG ?= pkg-config
 
 INSTALL = /usr/bin/install
 DESTDIR =
@@ -31,14 +33,20 @@
 INCLUDEDIR = $(PREFIX)/include
 
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
-	    sed -e 's/\(cygwin\).*/cygwin/')
+	    sed -e 's/\(cygwin\|msys\).*/\1/')
 
 ifeq ($(HOSTOS),darwin)
-SHAREDLIB_EXT=dylib
-SHAREDLIB_LINK_OPTIONS=-dynamiclib -Wl,-install_name -Wl,
+SHAREDLIB_EXT     = dylib
+SHAREDLIB_CFLAGS  = -fPIC
+SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl,
+else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin))
+SHAREDLIB_EXT     = so
+SHAREDLIB_CFLAGS  =
+SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
 else
-SHAREDLIB_EXT=so
-SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
+SHAREDLIB_EXT     = so
+SHAREDLIB_CFLAGS  = -fPIC
+SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
 endif
 
 #
@@ -112,11 +120,30 @@
 BIN += fdtdump
 BIN += fdtget
 BIN += fdtput
+BIN += fdtoverlay
 
 SCRIPTS = dtdiff
 
 all: $(BIN) libfdt
 
+# We need both Python and swig to build pylibfdt.
+.PHONY: maybe_pylibfdt
+maybe_pylibfdt: FORCE
+	if $(PKG_CONFIG) --cflags python2 >/dev/null 2>&1; then \
+		if which swig >/dev/null 2>&1; then \
+			can_build=yes; \
+		fi; \
+	fi; \
+	if [ "$$can_build" = "yes" ]; then \
+		$(MAKE) pylibfdt; \
+	else \
+		echo "## Skipping pylibfdt (install python dev and swig to build)"; \
+	fi
+
+ifeq ($(NO_PYTHON),)
+all: maybe_pylibfdt
+endif
+
 
 ifneq ($(DEPTARGETS),)
 -include $(DTC_OBJS:%.o=%.d)
@@ -124,6 +151,7 @@
 -include $(FDTDUMP_OBJS:%.o=%.d)
 -include $(FDTGET_OBJS:%.o=%.d)
 -include $(FDTPUT_OBJS:%.o=%.d)
+-include $(FDTOVERLAY_OBJS:%.o=%.d)
 endif
 
 
@@ -180,6 +208,10 @@
 
 install: install-bin install-lib install-includes
 
+ifeq ($(NO_PYTHON),)
+install: install_pylibfdt
+endif
+
 $(VERSION_FILE): Makefile FORCE
 	$(call filechk,version)
 
@@ -196,12 +228,30 @@
 
 fdtput:	$(FDTPUT_OBJS) $(LIBFDT_archive)
 
+fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_archive)
+
 dist:
 	git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \
 		> ../dtc-$(dtc_version).tar
 	cat ../dtc-$(dtc_version).tar | \
 		gzip -9 > ../dtc-$(dtc_version).tar.gz
 
+
+#
+# Rules for pylibfdt
+#
+PYLIBFDT_srcdir = pylibfdt
+PYLIBFDT_objdir = pylibfdt
+
+include $(PYLIBFDT_srcdir)/Makefile.pylibfdt
+
+.PHONY: pylibfdt
+pylibfdt: $(PYLIBFDT_objdir)/_libfdt.so
+
+pylibfdt_clean:
+	@$(VECHO) CLEAN "(pylibfdt)"
+	rm -f $(addprefix $(PYLIBFDT_objdir)/,$(PYLIBFDT_cleanfiles))
+
 #
 # Release signing and uploading
 # This is for maintainer convenience, don't try this at home.
@@ -218,6 +268,12 @@
 		$(KUPDIR)/dtc-$(dtc_version).tar.gz
 endif
 
+tags: FORCE
+	rm -f tags
+	find . \( -name tests -type d -prune \) -o \
+	       \( ! -name '*.tab.[ch]' ! -name '*.lex.c' \
+	       -name '*.[chly]' -type f -print \) | xargs ctags -a
+
 #
 # Testsuite rules
 #
@@ -228,6 +284,10 @@
 TESTS_BIN += fdtput
 TESTS_BIN += fdtget
 TESTS_BIN += fdtdump
+TESTS_BIN += fdtoverlay
+ifeq ($(NO_PYTHON),)
+TESTS_PYLIBFDT += maybe_pylibfdt
+endif
 
 include tests/Makefile.tests
 
@@ -237,7 +297,7 @@
 STD_CLEANFILES = *~ *.o *.$(SHAREDLIB_EXT) *.d *.a *.i *.s core a.out vgcore.* \
 	*.tab.[ch] *.lex.c *.output
 
-clean: libfdt_clean tests_clean
+clean: libfdt_clean pylibfdt_clean tests_clean
 	@$(VECHO) CLEAN
 	rm -f $(STD_CLEANFILES)
 	rm -f $(VERSION_FILE)
@@ -281,7 +341,7 @@
 
 $(LIBFDT_lib):
 	@$(VECHO) LD $@
-	$(CC) $(LDFLAGS) -fPIC $(SHAREDLIB_LINK_OPTIONS)$(LIBFDT_soname) -o $(LIBFDT_lib) $^
+	$(CC) $(LDFLAGS) $(SHAREDLIB_LDFLAGS)$(LIBFDT_soname) -o $(LIBFDT_lib) $^
 
 %.lex.c: %.l
 	@$(VECHO) LEX $@
diff -Nru device-tree-compiler-1.4.2/Makefile.utils device-tree-compiler-1.4.5/Makefile.utils
--- device-tree-compiler-1.4.2/Makefile.utils	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/Makefile.utils	2017-09-27 10:00:10.000000000 +0000
@@ -22,3 +22,9 @@
 	util.c
 
 FDTPUT_OBJS = $(FDTPUT_SRCS:%.c=%.o)
+
+FDTOVERLAY_SRCS = \
+	fdtoverlay.c \
+	util.c
+
+FDTOVERLAY_OBJS = $(FDTOVERLAY_SRCS:%.c=%.o)
diff -Nru device-tree-compiler-1.4.2/pylibfdt/.gitignore device-tree-compiler-1.4.5/pylibfdt/.gitignore
--- device-tree-compiler-1.4.2/pylibfdt/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/pylibfdt/.gitignore	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,3 @@
+libfdt.py
+libfdt.pyc
+libfdt_wrap.c
diff -Nru device-tree-compiler-1.4.2/pylibfdt/libfdt.i device-tree-compiler-1.4.5/pylibfdt/libfdt.i
--- device-tree-compiler-1.4.2/pylibfdt/libfdt.i	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/pylibfdt/libfdt.i	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,493 @@
+/*
+ * pylibfdt - Flat Device Tree manipulation in Python
+ * Copyright (C) 2017 Google, Inc.
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+%module libfdt
+
+%include <stdint.i>
+
+%{
+#define SWIG_FILE_WITH_INIT
+#include "libfdt.h"
+%}
+
+%pythoncode %{
+
+import struct
+
+# Error codes, corresponding to FDT_ERR_... in libfdt.h
+(NOTFOUND,
+        EXISTS,
+        NOSPACE,
+        BADOFFSET,
+        BADPATH,
+        BADPHANDLE,
+        BADSTATE,
+        TRUNCATED,
+        BADMAGIC,
+        BADVERSION,
+        BADSTRUCTURE,
+        BADLAYOUT,
+        INTERNAL,
+        BADNCELLS,
+        BADVALUE,
+        BADOVERLAY,
+        NOPHANDLES) = QUIET_ALL = range(1, 18)
+# QUIET_ALL can be passed as the 'quiet' parameter to avoid exceptions
+# altogether. All # functions passed this value will return an error instead
+# of raising an exception.
+
+# Pass this as the 'quiet' parameter to return -ENOTFOUND on NOTFOUND errors,
+# instead of raising an exception.
+QUIET_NOTFOUND = (NOTFOUND,)
+
+
+class FdtException(Exception):
+    """An exception caused by an error such as one of the codes above"""
+    def __init__(self, err):
+        self.err = err
+
+    def __str__(self):
+        return 'pylibfdt error %d: %s' % (self.err, fdt_strerror(self.err))
+
+def strerror(fdt_err):
+    """Get the string for an error number
+
+    Args:
+        fdt_err: Error number (-ve)
+
+    Returns:
+        String containing the associated error
+    """
+    return fdt_strerror(fdt_err)
+
+def check_err(val, quiet=()):
+    """Raise an error if the return value is -ve
+
+    This is used to check for errors returned by libfdt C functions.
+
+    Args:
+        val: Return value from a libfdt function
+        quiet: Errors to ignore (empty to raise on all errors)
+
+    Returns:
+        val if val >= 0
+
+    Raises
+        FdtException if val < 0
+    """
+    if val < 0:
+        if -val not in quiet:
+            raise FdtException(val)
+    return val
+
+def check_err_null(val, quiet=()):
+    """Raise an error if the return value is NULL
+
+    This is used to check for a NULL return value from certain libfdt C
+    functions
+
+    Args:
+        val: Return value from a libfdt function
+        quiet: Errors to ignore (empty to raise on all errors)
+
+    Returns:
+        val if val is a list, None if not
+
+    Raises
+        FdtException if val indicates an error was reported and the error
+        is not in @quiet.
+    """
+    # Normally a list is returned which contains the data and its length.
+    # If we get just an integer error code, it means the function failed.
+    if not isinstance(val, list):
+        if -val not in quiet:
+            raise FdtException(val)
+    return val
+
+class Fdt:
+    """Device tree class, supporting all operations
+
+    The Fdt object is created is created from a device tree binary file,
+    e.g. with something like:
+
+       fdt = Fdt(open("filename.dtb").read())
+
+    Operations can then be performed using the methods in this class. Each
+    method xxx(args...) corresponds to a libfdt function fdt_xxx(fdt, args...).
+
+    All methods raise an FdtException if an error occurs. To avoid this
+    behaviour a 'quiet' parameter is provided for some functions. This
+    defaults to empty, but you can pass a list of errors that you expect.
+    If one of these errors occurs, the function will return an error number
+    (e.g. -NOTFOUND).
+    """
+    def __init__(self, data):
+        self._fdt = bytearray(data)
+        check_err(fdt_check_header(self._fdt));
+
+    def subnode_offset(self, parentoffset, name, quiet=()):
+        """Get the offset of a named subnode
+
+        Args:
+            parentoffset: Offset of the parent node to check
+            name: Name of the required subnode, e.g. 'subnode@1'
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            The node offset of the found node, if any
+
+        Raises
+            FdtException if there is no node with that name, or other error
+        """
+        return check_err(fdt_subnode_offset(self._fdt, parentoffset, name),
+                         quiet)
+
+    def path_offset(self, path, quiet=()):
+        """Get the offset for a given path
+
+        Args:
+            path: Path to the required node, e.g. '/node@3/subnode@1'
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            Node offset
+
+        Raises
+            FdtException if the path is not valid or not found
+        """
+        return check_err(fdt_path_offset(self._fdt, path), quiet)
+
+    def first_property_offset(self, nodeoffset, quiet=()):
+        """Get the offset of the first property in a node offset
+
+        Args:
+            nodeoffset: Offset to the node to check
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            Offset of the first property
+
+        Raises
+            FdtException if the associated node has no properties, or some
+                other error occurred
+        """
+        return check_err(fdt_first_property_offset(self._fdt, nodeoffset),
+                         quiet)
+
+    def next_property_offset(self, prop_offset, quiet=()):
+        """Get the next property in a node
+
+        Args:
+            prop_offset: Offset of the previous property
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            Offset of the next property
+
+        Raises:
+            FdtException if the associated node has no more properties, or
+                some other error occurred
+        """
+        return check_err(fdt_next_property_offset(self._fdt, prop_offset),
+                         quiet)
+
+    def get_name(self, nodeoffset):
+        """Get the name of a node
+
+        Args:
+            nodeoffset: Offset of node to check
+
+        Returns:
+            Node name
+
+        Raises:
+            FdtException on error (e.g. nodeoffset is invalid)
+        """
+        return check_err_null(fdt_get_name(self._fdt, nodeoffset))[0]
+
+    def get_property_by_offset(self, prop_offset, quiet=()):
+        """Obtains a property that can be examined
+
+        Args:
+            prop_offset: Offset of property (e.g. from first_property_offset())
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            Property object, or None if not found
+
+        Raises:
+            FdtException on error (e.g. invalid prop_offset or device
+            tree format)
+        """
+        pdata = check_err_null(
+                fdt_get_property_by_offset(self._fdt, prop_offset), quiet)
+        if isinstance(pdata, (int)):
+            return pdata
+        return Property(pdata[0], pdata[1])
+
+    def first_subnode(self, nodeoffset, quiet=()):
+        """Find the first subnode of a parent node
+
+        Args:
+            nodeoffset: Node offset of parent node
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            The offset of the first subnode, if any
+
+        Raises:
+            FdtException if no subnode found or other error occurs
+        """
+        return check_err(fdt_first_subnode(self._fdt, nodeoffset), quiet)
+
+    def next_subnode(self, nodeoffset, quiet=()):
+        """Find the next subnode
+
+        Args:
+            nodeoffset: Node offset of previous subnode
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            The offset of the next subnode, if any
+
+        Raises:
+            FdtException if no more subnode found or other error occurs
+        """
+        return check_err(fdt_next_subnode(self._fdt, nodeoffset), quiet)
+
+    def totalsize(self):
+        """Return the total size of the device tree
+
+        Returns:
+            Total tree size in bytes
+        """
+        return check_err(fdt_totalsize(self._fdt))
+
+    def off_dt_struct(self):
+        """Return the start of the device tree struct area
+
+        Returns:
+            Start offset of struct area
+        """
+        return check_err(fdt_off_dt_struct(self._fdt))
+
+    def pack(self, quiet=()):
+        """Pack the device tree to remove unused space
+
+        This adjusts the tree in place.
+
+        Args:
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Raises:
+            FdtException if any error occurs
+        """
+        return check_err(fdt_pack(self._fdt), quiet)
+
+    def delprop(self, nodeoffset, prop_name):
+        """Delete a property from a node
+
+        Args:
+            nodeoffset: Node offset containing property to delete
+            prop_name: Name of property to delete
+
+        Raises:
+            FdtError if the property does not exist, or another error occurs
+        """
+        return check_err(fdt_delprop(self._fdt, nodeoffset, prop_name))
+
+    def getprop(self, nodeoffset, prop_name, quiet=()):
+        """Get a property from a node
+
+        Args:
+            nodeoffset: Node offset containing property to get
+            prop_name: Name of property to get
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            Value of property as a bytearray, or -ve error number
+
+        Raises:
+            FdtError if any error occurs (e.g. the property is not found)
+        """
+        pdata = check_err_null(fdt_getprop(self._fdt, nodeoffset, prop_name),
+                               quiet)
+        if isinstance(pdata, (int)):
+            return pdata
+        return bytearray(pdata[0])
+
+    def get_phandle(self, nodeoffset):
+        """Get the phandle of a node
+
+        Args:
+            nodeoffset: Node offset to check
+
+        Returns:
+            phandle of node, or 0 if the node has no phandle or another error
+            occurs
+        """
+        return fdt_get_phandle(self._fdt, nodeoffset)
+
+    def parent_offset(self, nodeoffset, quiet=()):
+        """Get the offset of a node's parent
+
+        Args:
+            nodeoffset: Node offset to check
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            The offset of the parent node, if any
+
+        Raises:
+            FdtException if no parent found or other error occurs
+        """
+        return check_err(fdt_parent_offset(self._fdt, nodeoffset), quiet)
+
+    def node_offset_by_phandle(self, phandle, quiet=()):
+        """Get the offset of a node with the given phandle
+
+        Args:
+            phandle: Phandle to search for
+            quiet: Errors to ignore (empty to raise on all errors)
+
+        Returns:
+            The offset of node with that phandle, if any
+
+        Raises:
+            FdtException if no node found or other error occurs
+        """
+        return check_err(fdt_node_offset_by_phandle(self._fdt, phandle), quiet)
+
+class Property:
+    """Holds a device tree property name and value.
+
+    This holds a copy of a property taken from the device tree. It does not
+    reference the device tree, so if anything changes in the device tree,
+    a Property object will remain valid.
+
+    Properties:
+        name: Property name
+        value: Proper value as a bytearray
+    """
+    def __init__(self, name, value):
+        self.name = name
+        self.value = value
+%}
+
+%rename(fdt_property) fdt_property_func;
+
+typedef int fdt32_t;
+
+%include "libfdt/fdt.h"
+
+%include "typemaps.i"
+
+/* Most functions don't change the device tree, so use a const void * */
+%typemap(in) (const void *)(const void *fdt) {
+	if (!PyByteArray_Check($input)) {
+		SWIG_exception_fail(SWIG_TypeError, "in method '" "$symname"
+			"', argument " "$argnum"" of type '" "$type""'");
+	}
+	$1 = (void *)PyByteArray_AsString($input);
+        fdt = $1;
+        fdt = fdt; /* avoid unused variable warning */
+}
+
+/* Some functions do change the device tree, so use void * */
+%typemap(in) (void *)(const void *fdt) {
+	if (!PyByteArray_Check($input)) {
+		SWIG_exception_fail(SWIG_TypeError, "in method '" "$symname"
+			"', argument " "$argnum"" of type '" "$type""'");
+	}
+	$1 = PyByteArray_AsString($input);
+        fdt = $1;
+        fdt = fdt; /* avoid unused variable warning */
+}
+
+%typemap(out) (struct fdt_property *) {
+	PyObject *buff;
+
+	if ($1) {
+		resultobj = PyString_FromString(
+			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+		buff = PyByteArray_FromStringAndSize(
+			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
+	}
+}
+
+%apply int *OUTPUT { int *lenp };
+
+/* typemap used for fdt_getprop() */
+%typemap(out) (const void *) {
+	if (!$1)
+		$result = Py_None;
+	else
+		$result = Py_BuildValue("s#", $1, *arg4);
+}
+
+/* We have both struct fdt_property and a function fdt_property() */
+%warnfilter(302) fdt_property;
+
+/* These are macros in the header so have to be redefined here */
+int fdt_magic(const void *fdt);
+int fdt_totalsize(const void *fdt);
+int fdt_off_dt_struct(const void *fdt);
+int fdt_off_dt_strings(const void *fdt);
+int fdt_off_mem_rsvmap(const void *fdt);
+int fdt_version(const void *fdt);
+int fdt_last_comp_version(const void *fdt);
+int fdt_boot_cpuid_phys(const void *fdt);
+int fdt_size_dt_strings(const void *fdt);
+int fdt_size_dt_struct(const void *fdt);
+
+%include <../libfdt/libfdt.h>
diff -Nru device-tree-compiler-1.4.2/pylibfdt/Makefile.pylibfdt device-tree-compiler-1.4.5/pylibfdt/Makefile.pylibfdt
--- device-tree-compiler-1.4.2/pylibfdt/Makefile.pylibfdt	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/pylibfdt/Makefile.pylibfdt	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,24 @@
+# Makefile.pylibfdt
+#
+
+PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
+		$(PYLIBFDT_srcdir)/libfdt.i
+PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so
+
+define run_setup
+	SOURCES="$(1)" CPPFLAGS="$(CPPFLAGS)" OBJDIR="$(PYLIBFDT_objdir)"
+	VERSION="$(dtc_version)"
+	$(PYLIBFDT_objdir)/setup.py --quiet $(2)
+endef
+
+$(PYMODULE): $(PYLIBFDT_srcs)
+	@$(VECHO) PYMOD $@
+	$(call run_setup, $^, build_ext --inplace)
+	mv _libfdt.so $@
+
+install_pylibfdt: $(PYMODULE)
+	$(VECHO) INSTALL-PYLIB; \
+	$(call run_setup, $(PYLIBFDT_srcs), \
+		install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX)))
+
+PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.so
diff -Nru device-tree-compiler-1.4.2/pylibfdt/setup.py device-tree-compiler-1.4.5/pylibfdt/setup.py
--- device-tree-compiler-1.4.2/pylibfdt/setup.py	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/pylibfdt/setup.py	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,121 @@
+#!/usr/bin/env python2
+
+"""
+setup.py file for SWIG libfdt
+Copyright (C) 2017 Google, Inc.
+Written by Simon Glass <sjg@chromium.org>
+
+Files to be built into the extension are provided in SOURCES
+C flags to use are provided in CPPFLAGS
+Object file directory is provided in OBJDIR
+Version is provided in VERSION
+
+If these variables are not given they are parsed from the Makefiles. This
+allows this script to be run stand-alone, e.g.:
+
+    ./pylibfdt/setup.py install [--prefix=...]
+"""
+
+from distutils.core import setup, Extension
+import os
+import re
+import sys
+
+# Decodes a Makefile assignment line into key and value (and plus for +=)
+RE_KEY_VALUE = re.compile('(?P<key>\w+) *(?P<plus>[+])?= *(?P<value>.*)$')
+
+
+def ParseMakefile(fname):
+    """Parse a Makefile to obtain its variables.
+
+    This collects variable assigments of the form:
+
+        VAR = value
+        VAR += more
+
+    It does not pick out := assignments, as these are not needed here. It does
+    handle line continuation.
+
+    Returns a dict:
+        key: Variable name (e.g. 'VAR')
+        value: Variable value (e.g. 'value more')
+    """
+    makevars = {}
+    with open(fname) as fd:
+        prev_text = ''  # Continuation text from previous line(s)
+        for line in fd.read().splitlines():
+          if line and line[-1] == '\\':  # Deal with line continuation
+            prev_text += line[:-1]
+            continue
+          elif prev_text:
+            line = prev_text + line
+            prev_text = ''  # Continuation is now used up
+          m = RE_KEY_VALUE.match(line)
+          if m:
+            value = m.group('value') or ''
+            key = m.group('key')
+
+            # Appending to a variable inserts a space beforehand
+            if 'plus' in m.groupdict() and key in makevars:
+              makevars[key] += ' ' + value
+            else:
+              makevars[key] = value
+    return makevars
+
+def GetEnvFromMakefiles():
+    """Scan the Makefiles to obtain the settings we need.
+
+    This assumes that this script is being run from the top-level directory,
+    not the pylibfdt directory.
+
+    Returns:
+        Tuple with:
+            List of swig options
+            Version string
+            List of files to build
+            List of extra C preprocessor flags needed
+            Object directory to use (always '')
+    """
+    basedir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+    swig_opts = ['-I%s' % basedir]
+    makevars = ParseMakefile(os.path.join(basedir, 'Makefile'))
+    version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'],
+                            makevars['SUBLEVEL'])
+    makevars = ParseMakefile(os.path.join(basedir, 'libfdt', 'Makefile.libfdt'))
+    files = makevars['LIBFDT_SRCS'].split()
+    files = [os.path.join(basedir, 'libfdt', fname) for fname in files]
+    files.append('pylibfdt/libfdt.i')
+    cflags = ['-I%s' % basedir, '-I%s/libfdt' % basedir]
+    objdir = ''
+    return swig_opts, version, files, cflags, objdir
+
+
+progname = sys.argv[0]
+files = os.environ.get('SOURCES', '').split()
+cflags = os.environ.get('CPPFLAGS', '').split()
+objdir = os.environ.get('OBJDIR')
+version = os.environ.get('VERSION')
+swig_opts = []
+
+# If we were called directly rather than through our Makefile (which is often
+# the case with Python module installation), read the settings from the
+# Makefile.
+if not all((version, files, cflags, objdir)):
+    swig_opts, version, files, cflags, objdir = GetEnvFromMakefiles()
+
+libfdt_module = Extension(
+    '_libfdt',
+    sources = files,
+    extra_compile_args = cflags,
+    swig_opts = swig_opts,
+)
+
+setup(
+    name='libfdt',
+    version= version,
+    author='Simon Glass <sjg@chromium.org>',
+    description='Python binding for libfdt',
+    ext_modules=[libfdt_module],
+    package_dir={'': objdir},
+    py_modules=['pylibfdt/libfdt'],
+)
diff -Nru device-tree-compiler-1.4.2/README device-tree-compiler-1.4.5/README
--- device-tree-compiler-1.4.2/README	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/README	2017-09-27 10:00:10.000000000 +0000
@@ -7,6 +7,83 @@
 David Gibson <david@gibson.dropbear.id.au>
 Jon Loeliger <jdl@jdl.com>
 
+
+Python library
+--------------
+
+A Python library is also available. To build this you will need to install
+swig and Python development files. On Debian distributions:
+
+   sudo apt-get install swig python-dev
+
+The library provides an Fdt class which you can use like this:
+
+$ PYTHONPATH=../pylibfdt python
+>>> import libfdt
+>>> fdt = libfdt.Fdt(open('test_tree1.dtb').read())
+>>> node = fdt.path_offset('/subnode@1')
+>>> print node
+124
+>>> prop_offset = fdt.first_property_offset(node)
+>>> prop = fdt.get_property_by_offset(prop_offset)
+>>> print '%s=%r' % (prop.name, prop.value)
+compatible=bytearray(b'subnode1\x00')
+>>> print '%s=%s' % (prop.name, prop.value)
+compatible=subnode1
+>>> node2 = fdt.path_offset('/')
+>>> print fdt.getprop(node2, 'compatible')
+test_tree1
+
+You will find tests in tests/pylibfdt_tests.py showing how to use each
+method. Help is available using the Python help command, e.g.:
+
+    $ cd pylibfdt
+    $ python -c "import libfdt; help(libfdt)"
+
+If you add new features, please check code coverage:
+
+    $ sudo apt-get install python-pip python-pytest
+    $ sudo pip install coverage
+    $ cd tests
+    $ coverage run pylibfdt_tests.py
+    $ coverage html
+    # Open 'htmlcov/index.html' in your browser
+
+
+To install the library via the normal setup.py method, use:
+
+    ./pylibfdt/setup.py [--prefix=/path/to/install_dir]
+
+If --prefix is not provided, the default prefix is used, typically '/usr'
+or '/usr/local'. See Python's distutils documentation for details. You can
+also install via the Makefile if you like, but the above is more common.
+
+To install both libfdt and pylibfdt you can use:
+
+    make install [SETUP_PREFIX=/path/to/install_dir] \
+            [PREFIX=/path/to/install_dir]
+
+To disable building the python library, even if swig and Python are available,
+use:
+
+    make NO_PYTHON=1
+
+
+More work remains to support all of libfdt, including access to numeric
+values.
+
+
+Tests
+-----
+
+Test files are kept in the tests/ directory. Use 'make check' to build and run
+all tests.
+
+If you want to adjust a test file, be aware that tree_tree1.dts is compiled
+and checked against a binary tree from assembler macros in trees.S. So
+if you change that file you must change tree.S also.
+
+
 Mailing list
 ------------
 The following list is for discussion about dtc and libfdt implementation
@@ -14,7 +91,3 @@
 
 Core device tree bindings are discussed on the devicetree-spec list:
 mailto:devicetree-spec@vger.kernel.org
-
-Home Page
----------
-http://devicetree.org/Device_Tree_Compiler
diff -Nru device-tree-compiler-1.4.2/srcpos.c device-tree-compiler-1.4.5/srcpos.c
--- device-tree-compiler-1.4.2/srcpos.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/srcpos.c	2017-09-27 10:00:10.000000000 +0000
@@ -252,7 +252,7 @@
 	const char *fname = "<no-file>";
 	char *pos_str;
 
-	if (pos)
+	if (pos->file && pos->file->name)
 		fname = pos->file->name;
 
 
diff -Nru device-tree-compiler-1.4.2/srcpos.h device-tree-compiler-1.4.5/srcpos.h
--- device-tree-compiler-1.4.2/srcpos.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/srcpos.h	2017-09-27 10:00:10.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include "util.h"
 
 struct srcfile_state {
 	FILE *f;
@@ -106,12 +107,10 @@
 extern struct srcpos *srcpos_copy(struct srcpos *pos);
 extern char *srcpos_string(struct srcpos *pos);
 
-extern void srcpos_verror(struct srcpos *pos, const char *prefix,
-			  const char *fmt, va_list va)
-	__attribute__((format(printf, 3, 0)));
-extern void srcpos_error(struct srcpos *pos, const char *prefix,
-			 const char *fmt, ...)
-	__attribute__((format(printf, 3, 4)));
+extern void PRINTF(3, 0) srcpos_verror(struct srcpos *pos, const char *prefix,
+					const char *fmt, va_list va);
+extern void PRINTF(3, 4) srcpos_error(struct srcpos *pos, const char *prefix,
+				      const char *fmt, ...);
 
 extern void srcpos_set_line(char *f, int l);
 
diff -Nru device-tree-compiler-1.4.2/tests/bad-gpio.dts device-tree-compiler-1.4.5/tests/bad-gpio.dts
--- device-tree-compiler-1.4.2/tests/bad-gpio.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/bad-gpio.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+	gpio: gpio-controller {
+		#gpio-cells = <3>;
+	};
+
+	node {
+		nr-gpios = <1>;
+		foo-gpios = <&gpio>;
+		bar-gpio = <&gpio 1 2 3>;
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/bad-interrupt-cells.dts device-tree-compiler-1.4.5/tests/bad-interrupt-cells.dts
--- device-tree-compiler-1.4.2/tests/bad-interrupt-cells.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/bad-interrupt-cells.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+/ {
+	interrupt-parent = <&intc>;
+	intc: interrupt-controller {
+		#interrupt-cells = <3>;
+	};
+
+	node {
+		interrupts = <1>;
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/bad-phandle-cells.dts device-tree-compiler-1.4.5/tests/bad-phandle-cells.dts
--- device-tree-compiler-1.4.2/tests/bad-phandle-cells.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/bad-phandle-cells.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+/ {
+	intc: interrupt-controller {
+		#interrupt-cells = <3>;
+	};
+
+	node {
+		interrupts-extended = <&intc>;
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/char_literal.c device-tree-compiler-1.4.5/tests/char_literal.c
--- device-tree-compiler-1.4.2/tests/char_literal.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/char_literal.c	2017-09-27 10:00:10.000000000 +0000
@@ -31,7 +31,7 @@
 int main(int argc, char *argv[])
 {
 	void *fdt;
-	uint32_t expected_cells[5];
+	fdt32_t expected_cells[5];
 
 	expected_cells[0] = cpu_to_fdt32((unsigned char)TEST_CHAR1);
 	expected_cells[1] = cpu_to_fdt32((unsigned char)TEST_CHAR2);
diff -Nru device-tree-compiler-1.4.2/tests/check_path.c device-tree-compiler-1.4.5/tests/check_path.c
--- device-tree-compiler-1.4.2/tests/check_path.c	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/check_path.c	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ *	Testcase for node existence
+ * Copyright (C) 2016 Konsulko Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+
+#include <libfdt.h>
+
+#include "tests.h"
+
+#define CHECK(code) \
+	{ \
+		int err = (code); \
+		if (err) \
+			FAIL(#code ": %s", fdt_strerror(err)); \
+	}
+
+/* 4k ought to be enough for anybody */
+#define FDT_COPY_SIZE	(4 * 1024)
+
+static void *open_dt(char *path)
+{
+	void *dt, *copy;
+
+	dt = load_blob(path);
+	copy = xmalloc(FDT_COPY_SIZE);
+
+	/*
+	 * Resize our DTs to 4k so that we have room to operate on
+	 */
+	CHECK(fdt_open_into(dt, copy, FDT_COPY_SIZE));
+
+	return copy;
+}
+
+int main(int argc, char *argv[])
+{
+	void *fdt_base;
+	int fail_config, exists, check_exists;
+
+	test_init(argc, argv);
+	fail_config = 0;
+
+	if (argc != 4)
+		fail_config = 1;
+
+	if (!fail_config) {
+		if (!strcmp(argv[2], "exists"))
+			check_exists = 1;
+		else if (!strcmp(argv[2], "not-exists"))
+			check_exists = 0;
+		else
+			fail_config = 1;
+	}
+
+	if (fail_config)
+		CONFIG("Usage: %s <base dtb> <[exists|not-exists]> <node-path>", argv[0]);
+
+	fdt_base = open_dt(argv[1]);
+
+	exists = fdt_path_offset(fdt_base, argv[3]) >= 0;
+
+	if (exists == check_exists)
+		PASS();
+	else
+		FAIL();
+}
diff -Nru device-tree-compiler-1.4.2/tests/dtbs_equal_ordered.c device-tree-compiler-1.4.5/tests/dtbs_equal_ordered.c
--- device-tree-compiler-1.4.2/tests/dtbs_equal_ordered.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/dtbs_equal_ordered.c	2017-09-27 10:00:10.000000000 +0000
@@ -28,7 +28,7 @@
 #include "tests.h"
 #include "testdata.h"
 
-int notequal; /* = 0 */
+static int notequal; /* = 0 */
 
 #define MISMATCH(fmt, ...)			\
 	do { \
diff -Nru device-tree-compiler-1.4.2/tests/dtbs_equal_unordered.c device-tree-compiler-1.4.5/tests/dtbs_equal_unordered.c
--- device-tree-compiler-1.4.2/tests/dtbs_equal_unordered.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/dtbs_equal_unordered.c	2017-09-27 10:00:10.000000000 +0000
@@ -29,7 +29,7 @@
 #include "tests.h"
 #include "testdata.h"
 
-int notequal; /* = 0 */
+static int notequal; /* = 0 */
 
 #define MISMATCH(fmt, ...)			\
 	do { \
@@ -59,14 +59,14 @@
 	const struct fdt_reserve_entry *re1 = p1;
 	const struct fdt_reserve_entry *re2 = p2;
 
-	if (re1->address < re2->address)
+	if (fdt64_to_cpu(re1->address) < fdt64_to_cpu(re2->address))
 		return -1;
-	else if (re1->address > re2->address)
+	else if (fdt64_to_cpu(re1->address) > fdt64_to_cpu(re2->address))
 		return 1;
 
-	if (re1->size < re2->size)
+	if (fdt64_to_cpu(re1->size) < fdt64_to_cpu(re2->size))
 		return -1;
-	else if (re1->size > re2->size)
+	else if (fdt64_to_cpu(re1->size) > fdt64_to_cpu(re2->size))
 		return 1;
 
 	return 0;
diff -Nru device-tree-compiler-1.4.2/tests/dumptrees.c device-tree-compiler-1.4.5/tests/dumptrees.c
--- device-tree-compiler-1.4.2/tests/dumptrees.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/dumptrees.c	2017-09-27 10:00:10.000000000 +0000
@@ -29,7 +29,7 @@
 
 #include "testdata.h"
 
-struct {
+static struct {
 	void *blob;
 	const char *filename;
 } trees[] = {
diff -Nru device-tree-compiler-1.4.2/tests/fdtoverlay-runtest.sh device-tree-compiler-1.4.5/tests/fdtoverlay-runtest.sh
--- device-tree-compiler-1.4.2/tests/fdtoverlay-runtest.sh	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/fdtoverlay-runtest.sh	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,40 @@
+#! /bin/sh
+
+# Run script for fdtoverlay tests
+# We run fdtoverlay to generate a target device tree, thn fdtget to check it
+
+# Usage
+#    fdtoverlay-runtest.sh name expected_output dtb_file node property flags value
+
+. ./tests.sh
+
+LOG=tmp.log.$$
+EXPECT=tmp.expect.$$
+rm -f $LOG $EXPECT
+trap "rm -f $LOG $EXPECT" 0
+
+expect="$1"
+echo $expect >$EXPECT
+node="$2"
+property="$3"
+flags="$4"
+basedtb="$5"
+targetdtb="$6"
+shift 6
+overlays="$@"
+
+# First run fdtoverlay
+verbose_run_check $VALGRIND "$FDTOVERLAY" -i "$basedtb" -o "$targetdtb" $overlays
+
+# Now fdtget to read the value
+verbose_run_log_check "$LOG" $VALGRIND "$DTGET" "$targetdtb" "$node" "$property" $flags
+
+if cmp $EXPECT $LOG >/dev/null; then
+    PASS
+else
+    if [ -z "$QUIET_TEST" ]; then
+	echo "EXPECTED :-:"
+	cat $EXPECT
+    fi
+    FAIL "Results differ from expected"
+fi
diff -Nru device-tree-compiler-1.4.2/tests/.gitignore device-tree-compiler-1.4.5/tests/.gitignore
--- device-tree-compiler-1.4.2/tests/.gitignore	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/.gitignore	2017-09-27 10:00:10.000000000 +0000
@@ -8,6 +8,7 @@
 /asm_tree_dump
 /boot-cpuid
 /char_literal
+/check_path
 /del_node
 /del_property
 /dtbs_equal_ordered
@@ -35,6 +36,8 @@
 /nopulate
 /notfound
 /open_pack
+/overlay
+/overlay_bad_fixup
 /parent_offset
 /path-references
 /path_offset
diff -Nru device-tree-compiler-1.4.2/tests/include7.dts device-tree-compiler-1.4.5/tests/include7.dts
--- device-tree-compiler-1.4.2/tests/include7.dts	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/include7.dts	2017-09-27 10:00:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 		subsubnode {
 			compatible = "subsubnode1", "subsubnode";
+			placeholder = "this is a placeholder string", "string2";
 			prop-int = <0xdeadbeef>;
 		};
 
diff -Nru device-tree-compiler-1.4.2/tests/integer-expressions.c device-tree-compiler-1.4.5/tests/integer-expressions.c
--- device-tree-compiler-1.4.2/tests/integer-expressions.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/integer-expressions.c	2017-09-27 10:00:10.000000000 +0000
@@ -30,7 +30,7 @@
 #include "tests.h"
 #include "testdata.h"
 
-struct test_expr {
+static struct test_expr {
 	const char *expr;
 	uint32_t result;
 } expr_table[] = {
@@ -70,7 +70,7 @@
 int main(int argc, char *argv[])
 {
 	void *fdt;
-	const uint32_t *res;
+	const fdt32_t *res;
 	int reslen;
 	int i;
 
diff -Nru device-tree-compiler-1.4.2/tests/Makefile.tests device-tree-compiler-1.4.5/tests/Makefile.tests
--- device-tree-compiler-1.4.2/tests/Makefile.tests	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/Makefile.tests	2017-09-27 10:00:10.000000000 +0000
@@ -24,7 +24,9 @@
 	utilfdt_test \
 	integer-expressions \
 	property_iterate \
-	subnode_iterate
+	subnode_iterate \
+	overlay overlay_bad_fixup \
+	check_path
 LIB_TESTS = $(LIB_TESTS_L:%=$(TESTS_PREFIX)%)
 
 LIBTREE_TESTS_L = truncated_property
@@ -70,13 +72,13 @@
 	rm -f $(STD_CLEANFILES:%=$(TESTS_PREFIX)%)
 	rm -f $(TESTS_CLEANFILES)
 
-check:	tests ${TESTS_BIN}
+check:	tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
 	cd $(TESTS_PREFIX); ./run_tests.sh
 
-checkm: tests ${TESTS_BIN}
+checkm: tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
 	cd $(TESTS_PREFIX); ./run_tests.sh -m 2>&1 | tee vglog.$$$$
 
-checkv:	tests ${TESTS_BIN}
+checkv:	tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
 	cd $(TESTS_PREFIX); ./run_tests.sh -v
 
 ifneq ($(DEPTARGETS),)
diff -Nru device-tree-compiler-1.4.2/tests/node_offset_by_prop_value.c device-tree-compiler-1.4.5/tests/node_offset_by_prop_value.c
--- device-tree-compiler-1.4.2/tests/node_offset_by_prop_value.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/node_offset_by_prop_value.c	2017-09-27 10:00:10.000000000 +0000
@@ -69,7 +69,7 @@
 
 #define check_search_cell(fdt, propname, propval, ...) \
 	{ \
-		uint32_t val = cpu_to_fdt32(propval); \
+		fdt32_t val = cpu_to_fdt32(propval); \
 		check_search((fdt), (propname), &val, sizeof(val), \
 			     ##__VA_ARGS__); \
 	}
diff -Nru device-tree-compiler-1.4.2/tests/nopulate.c device-tree-compiler-1.4.5/tests/nopulate.c
--- device-tree-compiler-1.4.2/tests/nopulate.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/nopulate.c	2017-09-27 10:00:10.000000000 +0000
@@ -45,7 +45,7 @@
 		       nextoffset - offset);
 		p += nextoffset - offset;
 
-		*((uint32_t *)p) = cpu_to_fdt32(FDT_NOP);
+		*((fdt32_t *)p) = cpu_to_fdt32(FDT_NOP);
 		p += FDT_TAGSIZE;
 
 	} while (tag != FDT_END);
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_bad_index.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_bad_index.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_bad_index.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_bad_index.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0:target:ab";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_base.dtsi device-tree-compiler-1.4.5/tests/overlay_bad_fixup_base.dtsi
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_base.dtsi	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_base.dtsi	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+/ {
+	fragment@0 {
+		target = <0xffffffff>;
+
+		__overlay__ {
+			test-property;
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup.c device-tree-compiler-1.4.5/tests/overlay_bad_fixup.c
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup.c	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup.c	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ *	Testcase for DT overlays()
+ * Copyright (C) 2016 Free Electrons
+ * Copyright (C) 2016 NextThing Co.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+
+#include <libfdt.h>
+
+#include "tests.h"
+
+#define CHECK(code, expected)					\
+	{							\
+		err = (code);					\
+		if (err != expected)				\
+			FAIL(#code ": %s", fdt_strerror(err));	\
+	}
+
+/* 4k ought to be enough for anybody */
+#define FDT_COPY_SIZE	(4 * 1024)
+
+static void *open_dt(char *path)
+{
+	void *dt, *copy;
+	int err;
+
+	dt = load_blob(path);
+	copy = xmalloc(FDT_COPY_SIZE);
+
+	/*
+	 * Resize our DTs to 4k so that we have room to operate on
+	 */
+	CHECK(fdt_open_into(dt, copy, FDT_COPY_SIZE), 0);
+
+	return copy;
+}
+
+int main(int argc, char *argv[])
+{
+	void *fdt_base, *fdt_overlay;
+	int err;
+
+	test_init(argc, argv);
+	if (argc != 3)
+		CONFIG("Usage: %s <base dtb> <overlay dtb>", argv[0]);
+
+	fdt_base = open_dt(argv[1]);
+	fdt_overlay = open_dt(argv[2]);
+
+	/* Apply the overlay */
+	CHECK(fdt_overlay_apply(fdt_base, fdt_overlay), -FDT_ERR_BADOVERLAY);
+
+	PASS();
+}
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_empty.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_empty.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_empty.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_empty.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_empty_index.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_empty_index.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_empty_index.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_empty_index.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0:target:";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_index_trailing.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_index_trailing.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_index_trailing.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_index_trailing.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0:target:0a";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_empty_prop.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_empty_prop.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_empty_prop.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_empty_prop.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0::";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_only.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_only.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_only.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_only.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_only_sep.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_only_sep.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_only_sep.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_only_sep.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0:";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_prop.dts device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_prop.dts
--- device-tree-compiler-1.4.2/tests/overlay_bad_fixup_path_prop.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_bad_fixup_path_prop.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "overlay_bad_fixup_base.dtsi"
+
+/ {
+	__fixups__ {
+		test = "/fragment@0:target";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_base.dts device-tree-compiler-1.4.5/tests/overlay_base.dts
--- device-tree-compiler-1.4.2/tests/overlay_base.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_base.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+/ {
+	test: test-node {
+		test-int-property = <42>;
+		test-str-property = "foo";
+
+		subtest: sub-test-node {
+			sub-test-property;
+		};
+	};
+};
+
+
diff -Nru device-tree-compiler-1.4.2/tests/overlay_base_manual_symbols.dts device-tree-compiler-1.4.5/tests/overlay_base_manual_symbols.dts
--- device-tree-compiler-1.4.2/tests/overlay_base_manual_symbols.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_base_manual_symbols.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+/ {
+	test: test-node {
+		phandle = <&test>; /* Force phandle generation */
+		test-int-property = <42>;
+		test-str-property = "foo";
+
+		subtest: sub-test-node {
+			sub-test-property;
+		};
+	};
+	__symbols__ {
+		test = &test;
+	};
+};
+
+
diff -Nru device-tree-compiler-1.4.2/tests/overlay.c device-tree-compiler-1.4.5/tests/overlay.c
--- device-tree-compiler-1.4.2/tests/overlay.c	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay.c	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,233 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ *	Testcase for DT overlays()
+ * Copyright (C) 2016 Free Electrons
+ * Copyright (C) 2016 NextThing Co.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+
+#include <libfdt.h>
+
+#include "tests.h"
+
+#define CHECK(code) \
+	{ \
+		int err = (code); \
+		if (err) \
+			FAIL(#code ": %s", fdt_strerror(err)); \
+	}
+
+/* 4k ought to be enough for anybody */
+#define FDT_COPY_SIZE	(4 * 1024)
+
+static int fdt_getprop_u32_by_poffset(void *fdt, const char *path,
+				      const char *name, int poffset,
+				      unsigned long *out)
+{
+	const fdt32_t *val;
+	int node_off;
+	int len;
+
+	node_off = fdt_path_offset(fdt, path);
+	if (node_off < 0)
+		return node_off;
+
+	val = fdt_getprop(fdt, node_off, name, &len);
+	if (!val || (len < (sizeof(uint32_t) * (poffset + 1))))
+		return -FDT_ERR_NOTFOUND;
+
+	*out = fdt32_to_cpu(*(val + poffset));
+
+	return 0;
+}
+
+static int check_getprop_string_by_name(void *fdt, const char *path,
+					const char *name, const char *val)
+{
+	int node_off;
+
+	node_off = fdt_path_offset(fdt, path);
+	if (node_off < 0)
+		return node_off;
+
+	check_getprop_string(fdt, node_off, name, val);
+
+	return 0;
+}
+
+static int check_getprop_u32_by_name(void *fdt, const char *path,
+				     const char *name, uint32_t val)
+{
+	int node_off;
+
+	node_off = fdt_path_offset(fdt, path);
+	CHECK(node_off < 0);
+
+	check_getprop_cell(fdt, node_off, name, val);
+
+	return 0;
+}
+
+static int check_getprop_null_by_name(void *fdt, const char *path,
+				      const char *name)
+{
+	int node_off;
+
+	node_off = fdt_path_offset(fdt, path);
+	CHECK(node_off < 0);
+
+	check_property(fdt, node_off, name, 0, NULL);
+
+	return 0;
+}
+
+static int fdt_overlay_change_int_property(void *fdt)
+{
+	return check_getprop_u32_by_name(fdt, "/test-node", "test-int-property",
+					 43);
+}
+
+static int fdt_overlay_change_str_property(void *fdt)
+{
+	return check_getprop_string_by_name(fdt, "/test-node",
+					    "test-str-property", "foobar");
+}
+
+static int fdt_overlay_add_str_property(void *fdt)
+{
+	return check_getprop_string_by_name(fdt, "/test-node",
+					    "test-str-property-2", "foobar2");
+}
+
+static int fdt_overlay_add_node(void *fdt)
+{
+	return check_getprop_null_by_name(fdt, "/test-node/new-node",
+					  "new-property");
+}
+
+static int fdt_overlay_add_subnode_property(void *fdt)
+{
+	check_getprop_null_by_name(fdt, "/test-node/sub-test-node",
+				   "sub-test-property");
+	check_getprop_null_by_name(fdt, "/test-node/sub-test-node",
+				   "new-sub-test-property");
+
+	return 0;
+}
+
+static int fdt_overlay_local_phandle(void *fdt)
+{
+	uint32_t local_phandle;
+	unsigned long val = 0;
+	int off;
+
+	off = fdt_path_offset(fdt, "/test-node/new-local-node");
+	CHECK(off < 0);
+
+	local_phandle = fdt_get_phandle(fdt, off);
+	CHECK(!local_phandle);
+
+	CHECK(fdt_getprop_u32_by_poffset(fdt, "/test-node",
+					 "test-several-phandle",
+					 0, &val));
+	CHECK(val != local_phandle);
+
+	CHECK(fdt_getprop_u32_by_poffset(fdt, "/test-node",
+					 "test-several-phandle",
+					 1, &val));
+	CHECK(val != local_phandle);
+
+	return 0;
+}
+
+static int fdt_overlay_local_phandles(void *fdt)
+{
+	uint32_t local_phandle, test_phandle;
+	unsigned long val = 0;
+	int off;
+
+	off = fdt_path_offset(fdt, "/test-node/new-local-node");
+	CHECK(off < 0);
+
+	local_phandle = fdt_get_phandle(fdt, off);
+	CHECK(!local_phandle);
+
+	off = fdt_path_offset(fdt, "/test-node");
+	CHECK(off < 0);
+
+	test_phandle = fdt_get_phandle(fdt, off);
+	CHECK(!test_phandle);
+
+	CHECK(fdt_getprop_u32_by_poffset(fdt, "/test-node",
+					 "test-phandle", 0, &val));
+	CHECK(test_phandle != val);
+
+	CHECK(fdt_getprop_u32_by_poffset(fdt, "/test-node",
+					 "test-phandle", 1, &val));
+	CHECK(local_phandle != val);
+
+	return 0;
+}
+
+static void *open_dt(char *path)
+{
+	void *dt, *copy;
+
+	dt = load_blob(path);
+	copy = xmalloc(FDT_COPY_SIZE);
+
+	/*
+	 * Resize our DTs to 4k so that we have room to operate on
+	 */
+	CHECK(fdt_open_into(dt, copy, FDT_COPY_SIZE));
+
+	return copy;
+}
+
+int main(int argc, char *argv[])
+{
+	void *fdt_base, *fdt_overlay;
+
+	test_init(argc, argv);
+	if (argc != 3)
+		CONFIG("Usage: %s <base dtb> <overlay dtb>", argv[0]);
+
+	fdt_base = open_dt(argv[1]);
+	fdt_overlay = open_dt(argv[2]);
+
+	/* Apply the overlay */
+	CHECK(fdt_overlay_apply(fdt_base, fdt_overlay));
+
+	fdt_overlay_change_int_property(fdt_base);
+	fdt_overlay_change_str_property(fdt_base);
+	fdt_overlay_add_str_property(fdt_base);
+	fdt_overlay_add_node(fdt_base);
+	fdt_overlay_add_subnode_property(fdt_base);
+
+	/*
+	 * If the base tree has a __symbols__ node, do the tests that
+	 * are only successful with a proper phandle support, and thus
+	 * dtc -@
+	 */
+	if (fdt_path_offset(fdt_base, "/__symbols__") >= 0) {
+		fdt_overlay_local_phandle(fdt_base);
+		fdt_overlay_local_phandles(fdt_base);
+	}
+
+	PASS();
+}
diff -Nru device-tree-compiler-1.4.2/tests/overlay_overlay.dts device-tree-compiler-1.4.5/tests/overlay_overlay.dts
--- device-tree-compiler-1.4.2/tests/overlay_overlay.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_overlay.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ * Copyright (c) 2016 Konsulko Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	/* Test that we can change an int by another */
+	fragment@0 {
+		target = <&test>;
+
+		__overlay__ {
+			test-int-property = <43>;
+		};
+	};
+
+	/* Test that we can replace a string by a longer one */
+	fragment@1 {
+		target = <&test>;
+
+		__overlay__ {
+			test-str-property = "foobar";
+		};
+	};
+
+	/* Test that we add a new property */
+	fragment@2 {
+		target = <&test>;
+
+		__overlay__ {
+			test-str-property-2 = "foobar2";
+		};
+	};
+
+	/* Test that we add a new node (by phandle) */
+	fragment@3 {
+		target = <&test>;
+
+		__overlay__ {
+			new-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@5 {
+		target = <&test>;
+
+		__overlay__ {
+			local: new-local-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@6 {
+		target = <&test>;
+
+		__overlay__ {
+			test-phandle = <&test>, <&local>;
+		};
+	};
+
+	fragment@7 {
+		target = <&test>;
+
+		__overlay__ {
+			test-several-phandle = <&local>, <&local>;
+		};
+	};
+
+	fragment@8 {
+		target = <&test>;
+
+		__overlay__ {
+			sub-test-node {
+				new-sub-test-property;
+			};
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_overlay_manual_fixups.dts device-tree-compiler-1.4.5/tests/overlay_overlay_manual_fixups.dts
--- device-tree-compiler-1.4.2/tests/overlay_overlay_manual_fixups.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_overlay_manual_fixups.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ * Copyright (c) 2016 Konsulko Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+/* Note no /plugin/ tag - we're manually generating the metadata for
+   testing purposes */
+
+/ {
+	/* Test that we can change an int by another */
+	fragment@0 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			test-int-property = <43>;
+		};
+	};
+
+	/* Test that we can replace a string by a longer one */
+	fragment@1 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			test-str-property = "foobar";
+		};
+	};
+
+	/* Test that we add a new property */
+	fragment@2 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			test-str-property-2 = "foobar2";
+		};
+	};
+
+	/* Test that we add a new node (by phandle) */
+	fragment@3 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			new-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@5 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			local: new-local-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@6 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			test-phandle = <0xffffffff /*&test*/>, <&local>;
+		};
+	};
+
+	fragment@7 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			test-several-phandle = <&local>, <&local>;
+		};
+	};
+
+	fragment@8 {
+		target = <0xffffffff /*&test*/>;
+
+		__overlay__ {
+			sub-test-node {
+				new-sub-test-property;
+			};
+		};
+	};
+
+	__local_fixups__ {
+		fragment@6 {
+			__overlay__ {
+				test-phandle = <4>;
+			};
+		};
+		fragment@7 {
+			__overlay__ {
+				test-several-phandle = <0 4>;
+			};
+		};
+	};
+	__fixups__ {
+		test = "/fragment@0:target:0",
+		       "/fragment@1:target:0",
+		       "/fragment@2:target:0",
+		       "/fragment@3:target:0",
+		       "/fragment@5:target:0",
+		       "/fragment@6:target:0",
+		       "/fragment@6/__overlay__:test-phandle:0",
+		       "/fragment@7:target:0",
+		       "/fragment@8:target:0";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_overlay_no_fixups.dts device-tree-compiler-1.4.5/tests/overlay_overlay_no_fixups.dts
--- device-tree-compiler-1.4.2/tests/overlay_overlay_no_fixups.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_overlay_no_fixups.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2016 NextThing Co
+ * Copyright (c) 2016 Free Electrons
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+/ {
+	fragment@0 {
+		target-path = "/test-node";
+
+		__overlay__ {
+			test-int-property = <43>;
+		};
+	};
+
+	/* Test that we can replace a string by a longer one */
+	fragment@1 {
+		target-path = "/test-node";
+
+		__overlay__ {
+			test-str-property = "foobar";
+		};
+	};
+
+	/* Test that we add a new property */
+	fragment@2 {
+		target-path = "/test-node";
+
+		__overlay__ {
+			test-str-property-2 = "foobar2";
+		};
+	};
+
+	fragment@3 {
+		target-path = "/test-node";
+
+		__overlay__ {
+			new-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@4 {
+		target-path = "/";
+
+		__overlay__ {
+			local: new-local-node {
+				new-property;
+			};
+		};
+	};
+
+	fragment@5 {
+		target-path = "/";
+
+		__overlay__ {
+			test-several-phandle = <&local>, <&local>;
+		};
+	};
+
+	fragment@6 {
+		target-path = "/test-node";
+
+		__overlay__ {
+			sub-test-node {
+				new-sub-test-property;
+			};
+		};
+	};
+
+	__local_fixups__ {
+		fragment@5 {
+			__overlay__ {
+				test-several-phandle = <0 4>;
+			};
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/overlay_overlay_simple.dts device-tree-compiler-1.4.5/tests/overlay_overlay_simple.dts
--- device-tree-compiler-1.4.2/tests/overlay_overlay_simple.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/overlay_overlay_simple.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2016 Konsulko Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+/plugin/;
+
+&test {
+	test-int-property = <43>;
+};
diff -Nru device-tree-compiler-1.4.2/tests/path-references.c device-tree-compiler-1.4.5/tests/path-references.c
--- device-tree-compiler-1.4.2/tests/path-references.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/path-references.c	2017-09-27 10:00:10.000000000 +0000
@@ -66,7 +66,7 @@
 	void *fdt;
 	const char *p;
 	int len, multilen;
-	int n1, n2;
+	int n1, n2, n3, n4;
 
 	test_init(argc, argv);
 	fdt = load_blob_arg(argc, argv);
@@ -92,6 +92,16 @@
 	if ((!streq(p, "/node1") || !streq(p + strlen("/node1") + 1, "/node2")))
 		FAIL("multiref has wrong value");
 
+	/* Check reference to nested nodes with common prefix */
+	n3 = fdt_path_offset(fdt, "/foo/baz");
+	if (n3 < 0)
+		FAIL("fdt_path_offset(/foo/baz): %s", fdt_strerror(n3));
+	n4 = fdt_path_offset(fdt, "/foobar/baz");
+	if (n4 < 0)
+		FAIL("fdt_path_offset(/foobar/baz): %s", fdt_strerror(n4));
+	check_ref(fdt, n3, "/foobar/baz");
+	check_ref(fdt, n4, "/foo/baz");
+
 	check_rref(fdt);
 
 	PASS();
diff -Nru device-tree-compiler-1.4.2/tests/path-references.dts device-tree-compiler-1.4.5/tests/path-references.dts
--- device-tree-compiler-1.4.2/tests/path-references.dts	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/path-references.dts	2017-09-27 10:00:10.000000000 +0000
@@ -12,4 +12,17 @@
 		ref = &{/node1}; /* reference after target */
 		lref = &n1;
 	};
+	/* Check references to nested nodes with common prefix */
+	foobar {
+		n3: baz {
+			ref = &{/foo/baz};
+			lref = &n4;
+		};
+	};
+	foo {
+		n4: baz {
+			ref = &{/foobar/baz};
+			lref = &n3;
+		};
+	};
 };
diff -Nru device-tree-compiler-1.4.2/tests/property_iterate.c device-tree-compiler-1.4.5/tests/property_iterate.c
--- device-tree-compiler-1.4.2/tests/property_iterate.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/property_iterate.c	2017-09-27 10:00:10.000000000 +0000
@@ -33,7 +33,7 @@
 
 static void test_node(void *fdt, int parent_offset)
 {
-	fdt32_t properties;
+	uint32_t properties;
 	const fdt32_t *prop;
 	int offset, property;
 	int count;
@@ -48,7 +48,7 @@
 		FAIL("Missing/invalid test-properties property at '%s'",
 		     fdt_get_name(fdt, parent_offset, NULL));
 	}
-	properties = cpu_to_fdt32(*prop);
+	properties = fdt32_to_cpu(*prop);
 
 	count = 0;
 	offset = fdt_first_subnode(fdt, parent_offset);
diff -Nru device-tree-compiler-1.4.2/tests/pylibfdt_tests.py device-tree-compiler-1.4.5/tests/pylibfdt_tests.py
--- device-tree-compiler-1.4.2/tests/pylibfdt_tests.py	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/pylibfdt_tests.py	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,334 @@
+# pylibfdt - Tests for Flat Device Tree manipulation in Python
+# Copyright (C) 2017 Google, Inc.
+# Written by Simon Glass <sjg@chromium.org>
+#
+# libfdt is dual licensed: you can use it either under the terms of
+# the GPL, or the BSD license, at your option.
+#
+#  a) This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU General Public License as
+#     published by the Free Software Foundation; either version 2 of the
+#     License, or (at your option) any later version.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public
+#     License along with this library; if not, write to the Free
+#     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+#     MA 02110-1301 USA
+#
+# Alternatively,
+#
+#  b) Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#     1. Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#     2. Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+#     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+#     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+#     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+#     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+#     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+#     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+#     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+import sys
+import types
+import unittest
+
+sys.path.insert(0, '../pylibfdt')
+import libfdt
+from libfdt import FdtException, QUIET_NOTFOUND, QUIET_ALL
+
+def get_err(err_code):
+    """Convert an error code into an error message
+
+    Args:
+        err_code: Error code value (FDT_ERR_...)
+
+    Returns:
+        String error code
+    """
+    return 'pylibfdt error %d: %s' % (-err_code, libfdt.strerror(-err_code))
+
+def _ReadFdt(fname):
+    """Read a device tree file into an Fdt object, ready for use
+
+    Args:
+        fname: Filename to read from
+
+    Returns:
+        Fdt bytearray suitable for passing to libfdt functions
+    """
+    return libfdt.Fdt(open(fname).read())
+
+class PyLibfdtTests(unittest.TestCase):
+    """Test class for pylibfdt
+
+    Properties:
+        fdt: Device tree file used for testing
+    """
+
+    def setUp(self):
+        """Read in the device tree we use for testing"""
+        self.fdt = _ReadFdt('test_tree1.dtb')
+
+    def GetPropList(self, node_path):
+        """Read a list of properties from a node
+
+        Args:
+            node_path: Full path to node, e.g. '/subnode@1/subsubnode'
+
+        Returns:
+            List of property names for that node, e.g. ['compatible', 'reg']
+        """
+        prop_list = []
+        node = self.fdt.path_offset(node_path)
+        poffset = self.fdt.first_property_offset(node, QUIET_NOTFOUND)
+        while poffset > 0:
+            prop = self.fdt.get_property_by_offset(poffset)
+            prop_list.append(prop.name)
+            poffset = self.fdt.next_property_offset(poffset, QUIET_NOTFOUND)
+        return prop_list
+
+    def testImport(self):
+        """Check that we can import the library correctly"""
+        self.assertEquals(type(libfdt), types.ModuleType)
+
+    def testBadFdt(self):
+        """Check that a filename provided accidentally is not accepted"""
+        with self.assertRaises(FdtException) as e:
+            fdt = libfdt.Fdt('a string')
+        self.assertEquals(e.exception.err, -libfdt.BADMAGIC)
+
+    def testSubnodeOffset(self):
+        """check that we can locate a subnode by name"""
+        node1 = self.fdt.path_offset('/subnode@1')
+        self.assertEquals(self.fdt.subnode_offset(0, 'subnode@1'), node1)
+
+        with self.assertRaises(FdtException) as e:
+            self.fdt.subnode_offset(0, 'missing')
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+        node2 = self.fdt.path_offset('/subnode@1/subsubnode')
+        self.assertEquals(self.fdt.subnode_offset(node1, 'subsubnode'), node2)
+
+    def testPathOffset(self):
+        """Check that we can find the offset of a node"""
+        self.assertEquals(self.fdt.path_offset('/'), 0)
+        self.assertTrue(self.fdt.path_offset('/subnode@1') > 0)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.path_offset('/wibble')
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+        self.assertEquals(self.fdt.path_offset('/wibble', QUIET_NOTFOUND),
+                          -libfdt.NOTFOUND)
+
+    def testPropertyOffset(self):
+        """Walk through all the properties in the root node"""
+        offset = self.fdt.first_property_offset(0)
+        self.assertTrue(offset > 0)
+        for i in range(5):
+            next_offset = self.fdt.next_property_offset(offset)
+            self.assertTrue(next_offset > offset)
+            offset = next_offset
+        self.assertEquals(self.fdt.next_property_offset(offset, QUIET_NOTFOUND),
+                          -libfdt.NOTFOUND)
+
+    def testPropertyOffsetExceptions(self):
+        """Check that exceptions are raised as expected"""
+        with self.assertRaises(FdtException) as e:
+            self.fdt.first_property_offset(107)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+
+        # Quieten the NOTFOUND exception and check that a BADOFFSET
+        # exception is still raised.
+        with self.assertRaises(FdtException) as e:
+            self.fdt.first_property_offset(107, QUIET_NOTFOUND)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.next_property_offset(107, QUIET_NOTFOUND)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+
+        # Check that NOTFOUND can be quietened.
+        node = self.fdt.path_offset('/subnode@1/ss1')
+        self.assertEquals(self.fdt.first_property_offset(node, QUIET_NOTFOUND),
+                          -libfdt.NOTFOUND)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.first_property_offset(node)
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+    def testGetName(self):
+        """Check that we can get the name of a node"""
+        self.assertEquals(self.fdt.get_name(0), '')
+        node = self.fdt.path_offset('/subnode@1/subsubnode')
+        self.assertEquals(self.fdt.get_name(node), 'subsubnode')
+
+        with self.assertRaises(FdtException) as e:
+            self.fdt.get_name(-2)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+
+    def testGetPropertyByOffset(self):
+        """Check that we can read the name and contents of a property"""
+        root = 0
+        poffset = self.fdt.first_property_offset(root)
+        prop = self.fdt.get_property_by_offset(poffset)
+        self.assertEquals(prop.name, 'compatible')
+        self.assertEquals(prop.value, 'test_tree1\0')
+
+        with self.assertRaises(FdtException) as e:
+            self.fdt.get_property_by_offset(-2)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+        self.assertEquals(
+                -libfdt.BADOFFSET,
+                self.fdt.get_property_by_offset(-2, [libfdt.BADOFFSET]))
+
+    def testGetProp(self):
+        """Check that we can read the contents of a property by name"""
+        root = self.fdt.path_offset('/')
+        value = self.fdt.getprop(root, "compatible")
+        self.assertEquals(value, 'test_tree1\0')
+        self.assertEquals(-libfdt.NOTFOUND, self.fdt.getprop(root, 'missing',
+                                                             QUIET_NOTFOUND))
+
+        with self.assertRaises(FdtException) as e:
+            self.fdt.getprop(root, 'missing')
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+        node = self.fdt.path_offset('/subnode@1/subsubnode')
+        value = self.fdt.getprop(node, "compatible")
+        self.assertEquals(value, 'subsubnode1\0subsubnode\0')
+
+    def testStrError(self):
+        """Check that we can get an error string"""
+        self.assertEquals(libfdt.strerror(-libfdt.NOTFOUND),
+                          'FDT_ERR_NOTFOUND')
+
+    def testFirstNextSubnodeOffset(self):
+        """Check that we can walk through subnodes"""
+        node_list = []
+        node = self.fdt.first_subnode(0, QUIET_NOTFOUND)
+        while node >= 0:
+            node_list.append(self.fdt.get_name(node))
+            node = self.fdt.next_subnode(node, QUIET_NOTFOUND)
+        self.assertEquals(node_list, ['subnode@1', 'subnode@2'])
+
+    def testFirstNextSubnodeOffsetExceptions(self):
+        """Check except handling for first/next subnode functions"""
+        node = self.fdt.path_offset('/subnode@1/subsubnode', QUIET_NOTFOUND)
+        self.assertEquals(self.fdt.first_subnode(node, QUIET_NOTFOUND),
+                          -libfdt.NOTFOUND)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.first_subnode(node)
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+        node = self.fdt.path_offset('/subnode@1/ss1', QUIET_NOTFOUND)
+        self.assertEquals(self.fdt.next_subnode(node, QUIET_NOTFOUND),
+                          -libfdt.NOTFOUND)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.next_subnode(node)
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+    def testDeleteProperty(self):
+        """Test that we can delete a property"""
+        node_name = '/subnode@1'
+        self.assertEquals(self.GetPropList(node_name),
+                          ['compatible', 'reg', 'prop-int'])
+        node = self.fdt.path_offset('/%s' % node_name)
+        self.assertEquals(self.fdt.delprop(node, 'reg'), 0)
+        self.assertEquals(self.GetPropList(node_name),
+                          ['compatible', 'prop-int'])
+
+    def testHeader(self):
+        """Test that we can access the header values"""
+        self.assertEquals(self.fdt.totalsize(), len(self.fdt._fdt))
+        self.assertEquals(self.fdt.off_dt_struct(), 88)
+
+    def testPack(self):
+        """Test that we can pack the tree after deleting something"""
+        orig_size = self.fdt.totalsize()
+        node = self.fdt.path_offset('/subnode@2', QUIET_NOTFOUND)
+        self.assertEquals(self.fdt.delprop(node, 'prop-int'), 0)
+        self.assertEquals(orig_size, self.fdt.totalsize())
+        self.assertEquals(self.fdt.pack(), 0)
+        self.assertTrue(self.fdt.totalsize() < orig_size)
+
+    def testBadPropertyOffset(self):
+        """Test that bad property offsets are detected"""
+        with self.assertRaises(FdtException) as e:
+            self.fdt.get_property_by_offset(13)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.first_property_offset(3)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+        with self.assertRaises(FdtException) as e:
+            self.fdt.next_property_offset(3)
+        self.assertEquals(e.exception.err, -libfdt.BADOFFSET)
+
+    def testBadPathOffset(self):
+        """Test that bad path names are detected"""
+        with self.assertRaisesRegexp(FdtException, get_err(libfdt.BADPATH)):
+            self.fdt.path_offset('not-present')
+
+    def testQuietAll(self):
+        """Check that exceptions can be masked by QUIET_ALL"""
+        self.assertEquals(-libfdt.NOTFOUND,
+                          self.fdt.path_offset('/missing', QUIET_ALL))
+        self.assertEquals(-libfdt.BADOFFSET,
+                          self.fdt.get_property_by_offset(13, QUIET_ALL))
+        self.assertEquals(-libfdt.BADPATH,
+                          self.fdt.path_offset('missing', QUIET_ALL))
+
+    def testIntegers(self):
+        """Check that integers can be passed and returned"""
+        self.assertEquals(0, libfdt.fdt_get_phandle(self.fdt._fdt, 0))
+        node2 = self.fdt.path_offset('/subnode@2')
+        self.assertEquals(0x2000, libfdt.fdt_get_phandle(self.fdt._fdt, node2))
+
+    def testGetPhandle(self):
+        """Test for the get_phandle() method"""
+        self.assertEquals(0, self.fdt.get_phandle(0))
+        node2 = self.fdt.path_offset('/subnode@2')
+        self.assertEquals(0x2000, self.fdt.get_phandle(node2))
+
+    def testParentOffset(self):
+        """Test for the parent_offset() method"""
+        self.assertEquals(-libfdt.NOTFOUND,
+                          self.fdt.parent_offset(0, QUIET_NOTFOUND))
+        with self.assertRaises(FdtException) as e:
+            self.fdt.parent_offset(0)
+        self.assertEquals(e.exception.err, -libfdt.NOTFOUND)
+
+        node1 = self.fdt.path_offset('/subnode@2')
+        self.assertEquals(0, self.fdt.parent_offset(node1))
+        node2 = self.fdt.path_offset('/subnode@2/subsubnode@0')
+        self.assertEquals(node1, self.fdt.parent_offset(node2))
+
+    def testNodeOffsetByPhandle(self):
+        """Test for the node_offset_by_phandle() method"""
+        self.assertEquals(-libfdt.NOTFOUND,
+                          self.fdt.node_offset_by_phandle(1, QUIET_NOTFOUND))
+        node1 = self.fdt.path_offset('/subnode@2')
+        self.assertEquals(node1, self.fdt.node_offset_by_phandle(0x2000))
+        node2 = self.fdt.path_offset('/subnode@2/subsubnode@0')
+        self.assertEquals(node2, self.fdt.node_offset_by_phandle(0x2001))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff -Nru device-tree-compiler-1.4.2/tests/references.c device-tree-compiler-1.4.5/tests/references.c
--- device-tree-compiler-1.4.2/tests/references.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/references.c	2017-09-27 10:00:10.000000000 +0000
@@ -29,7 +29,7 @@
 
 static void check_ref(const void *fdt, int node, uint32_t checkref)
 {
-	const uint32_t *p;
+	const fdt32_t *p;
 	uint32_t ref;
 	int len;
 
@@ -58,7 +58,7 @@
 
 static void check_rref(const void *fdt)
 {
-	const uint32_t *p;
+	const fdt32_t *p;
 	uint32_t ref;
 	int len;
 
diff -Nru device-tree-compiler-1.4.2/tests/run_tests.sh device-tree-compiler-1.4.5/tests/run_tests.sh
--- device-tree-compiler-1.4.2/tests/run_tests.sh	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/run_tests.sh	2017-09-27 10:00:10.000000000 +0000
@@ -110,6 +110,21 @@
     base_run_test wrap_error "$@"
 }
 
+# $1: dtb file
+# $2: align base
+check_align () {
+    shorten_echo "check_align $@:	"
+    local size=$(stat -c %s "$1")
+    local align="$2"
+    (
+	if [ $(($size % $align)) -eq 0 ] ;then
+	    PASS
+	else
+	    FAIL "Output size $size is not $align-byte aligned"
+	fi
+    )
+}
+
 run_dtc_test () {
     printf "dtc $*:	"
     base_run_test wrap_test $VALGRIND $DTC "$@"
@@ -142,7 +157,88 @@
     file="$1"
     shorten_echo fdtdump-runtest.sh "$file"
     printf ":	"
-    base_run_test sh fdtdump-runtest.sh "$file"
+    base_run_test sh fdtdump-runtest.sh "$file" 2>/dev/null
+}
+
+run_fdtoverlay_test() {
+    expect="$1"
+    shift
+    shorten_echo fdtoverlay-runtest.sh "$expect" "$@"
+    printf ":	"
+    base_run_test sh fdtoverlay-runtest.sh "$expect" "$@"
+}
+
+BAD_FIXUP_TREES="bad_index \
+		empty \
+		empty_index \
+		index_trailing \
+		path_empty_prop \
+		path_only \
+		path_only_sep \
+		path_prop"
+
+# Test to exercise libfdt overlay application without dtc's overlay support
+libfdt_overlay_tests () {
+    # First test a doctored overlay which requires only local fixups
+    run_dtc_test -I dts -O dtb -o overlay_base_no_symbols.test.dtb overlay_base.dts
+    run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__symbols__"
+    run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__fixups__"
+    run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__local_fixups__"
+
+    run_dtc_test -I dts -O dtb -o overlay_overlay_no_fixups.test.dtb overlay_overlay_no_fixups.dts
+    run_test check_path overlay_overlay_no_fixups.test.dtb not-exists "/__symbols__"
+    run_test check_path overlay_overlay_no_fixups.test.dtb not-exists "/__fixups__"
+    run_test check_path overlay_overlay_no_fixups.test.dtb exists "/__local_fixups__"
+
+    run_test overlay overlay_base_no_symbols.test.dtb overlay_overlay_no_fixups.test.dtb
+
+    # Then test with manually constructed fixups
+    run_dtc_test -I dts -O dtb -o overlay_base_manual_symbols.test.dtb overlay_base_manual_symbols.dts
+    run_test check_path overlay_base_manual_symbols.test.dtb exists "/__symbols__"
+    run_test check_path overlay_base_manual_symbols.test.dtb not-exists "/__fixups__"
+    run_test check_path overlay_base_manual_symbols.test.dtb not-exists "/__local_fixups__"
+
+    run_dtc_test -I dts -O dtb -o overlay_overlay_manual_fixups.test.dtb overlay_overlay_manual_fixups.dts
+    run_test check_path overlay_overlay_manual_fixups.test.dtb not-exists "/__symbols__"
+    run_test check_path overlay_overlay_manual_fixups.test.dtb exists "/__fixups__"
+    run_test check_path overlay_overlay_manual_fixups.test.dtb exists "/__local_fixups__"
+
+    run_test overlay overlay_base_manual_symbols.test.dtb overlay_overlay_manual_fixups.test.dtb
+
+    # Bad fixup tests
+    for test in $BAD_FIXUP_TREES; do
+	tree="overlay_bad_fixup_$test"
+	run_dtc_test -I dts -O dtb -o $tree.test.dtb $tree.dts
+	run_test overlay_bad_fixup overlay_base_no_symbols.test.dtb $tree.test.dtb
+    done
+}
+
+# Tests to exercise dtc's overlay generation support
+dtc_overlay_tests () {
+    # Overlay tests for dtc
+    run_dtc_test -@ -I dts -O dtb -o overlay_base.test.dtb overlay_base.dts
+    run_test check_path overlay_base.test.dtb exists "/__symbols__"
+    run_test check_path overlay_base.test.dtb not-exists "/__fixups__"
+    run_test check_path overlay_base.test.dtb not-exists "/__local_fixups__"
+
+    run_dtc_test -I dts -O dtb -o overlay_overlay.test.dtb overlay_overlay.dts
+    run_test check_path overlay_overlay.test.dtb not-exists "/__symbols__"
+    run_test check_path overlay_overlay.test.dtb exists "/__fixups__"
+    run_test check_path overlay_overlay.test.dtb exists "/__local_fixups__"
+
+    run_test overlay overlay_base.test.dtb overlay_overlay.test.dtb
+
+    # test plugin source to dtb and back
+    run_dtc_test -I dtb -O dts -o overlay_overlay_decompile.test.dts overlay_overlay.test.dtb
+    run_dtc_test -I dts -O dtb -o overlay_overlay_decompile.test.dtb overlay_overlay_decompile.test.dts
+    run_test dtbs_equal_ordered overlay_overlay.test.dtb overlay_overlay_decompile.test.dtb
+
+    # Test generation of aliases insted of symbols
+    run_dtc_test -A -I dts -O dtb -o overlay_base_with_aliases.dtb overlay_base.dts
+    run_test check_path overlay_base_with_aliases.dtb exists "/aliases"
+    run_test check_path overlay_base_with_aliases.dtb not-exists "/__symbols__"
+    run_test check_path overlay_base_with_aliases.dtb not-exists "/__fixups__"
+    run_test check_path overlay_base_with_aliases.dtb not-exists "/__local_fixups__"
 }
 
 tree1_tests () {
@@ -258,6 +354,7 @@
     run_test appendprop2 appendprop1.test.dtb
     run_dtc_test -I dts -O dtb -o appendprop.test.dtb appendprop.dts
     run_test dtbs_equal_ordered appendprop2.test.dtb appendprop.test.dtb
+    libfdt_overlay_tests
 
     for basetree in test_tree1.dtb sw_tree1.test.dtb rw_tree1.test.dtb; do
 	run_test nopulate $basetree
@@ -331,7 +428,7 @@
     run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb path-references.dts
     run_test path-references dtc_path-references.test.dtb
 
-    run_test phandle_format dtc_references.test.dtb both
+    run_test phandle_format dtc_references.test.dtb epapr
     for f in legacy epapr both; do
 	run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts
 	run_test phandle_format dtc_references.test.$f.dtb $f
@@ -422,6 +519,7 @@
     run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb
     run_dtc_test -I dts -O dtb -o dtc_tree1_merge_path.test.dtb test_tree1_merge_path.dts
     tree1_tests dtc_tree1_merge_path.test.dtb test_tree1.dtb
+    run_wrap_error_test $DTC -I dts -O dtb -o /dev/null test_label_ref.dts
 
     # Check prop/node delete functionality
     run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb test_tree1_delete.dts
@@ -450,6 +548,12 @@
     check_tests obsolete-chosen-interrupt-controller.dts obsolete_chosen_interrupt_controller
     check_tests reg-without-unit-addr.dts unit_address_vs_reg
     check_tests unit-addr-without-reg.dts unit_address_vs_reg
+    check_tests unit-addr-leading-0x.dts unit_address_format
+    check_tests unit-addr-leading-0s.dts unit_address_format
+    check_tests bad-phandle-cells.dts interrupts_extended_property
+    check_tests bad-gpio.dts gpios_property
+    run_sh_test dtc-checkfails.sh deprecated_gpio_property -- -Wdeprecated_gpio_property -I dts -O dtb bad-gpio.dts
+    check_tests bad-interrupt-cells.dts interrupts_property
     run_sh_test dtc-checkfails.sh node_name_chars -- -I dtb -O dtb bad_node_char.dtb
     run_sh_test dtc-checkfails.sh node_name_format -- -I dtb -O dtb bad_node_format.dtb
     run_sh_test dtc-checkfails.sh prop_name_chars -- -I dtb -O dtb bad_prop_char.dtb
@@ -461,6 +565,9 @@
     run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label5.dts
     run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label6.dts
 
+    run_test check_path test_tree1.dtb exists "/subnode@1"
+    run_test check_path test_tree1.dtb not-exists "/subnode@10"
+
     # Check warning options
     run_sh_test dtc-checkfails.sh address_cells_is_cell interrupt_cells_is_cell -n size_cells_is_cell -- -Wno_size_cells_is_cell -I dts -O dtb bad-ncells.dts
     run_sh_test dtc-fails.sh -n test-warn-output.test.dtb -I dts -O dtb bad-ncells.dts
@@ -503,6 +610,19 @@
 	-o search_paths_b.dtb search_paths_b.dts
     run_dtc_test -I dts -O dtb -o search_paths_subdir.dtb \
 	search_dir_b/search_paths_subdir.dts
+
+    # Check -a option
+    for align in 2 4 8 16 32 64; do
+	# -p -a
+	run_dtc_test -O dtb -p 1000 -a $align -o align0.dtb subnode_iterate.dts
+	check_align align0.dtb $align
+	# -S -a
+	run_dtc_test -O dtb -S 1999 -a $align -o align1.dtb subnode_iterate.dts
+	check_align align1.dtb $align
+    done
+
+    # Tests for overlay/plugin generation
+    dtc_overlay_tests
 }
 
 cmp_tests () {
@@ -663,6 +783,55 @@
     run_fdtdump_test fdtdump.dts
 }
 
+fdtoverlay_tests() {
+    base=overlay_base.dts
+    basedtb=overlay_base.fdoverlay.test.dtb
+    overlay=overlay_overlay_manual_fixups.dts
+    overlaydtb=overlay_overlay_manual_fixups.fdoverlay.test.dtb
+    targetdtb=target.fdoverlay.test.dtb
+
+    run_dtc_test -@ -I dts -O dtb -o $basedtb $base
+    run_dtc_test -@ -I dts -O dtb -o $overlaydtb $overlay
+
+    # test that the new property is installed
+    run_fdtoverlay_test foobar "/test-node" "test-str-property" "-ts" ${basedtb} ${targetdtb} ${overlaydtb}
+
+    stacked_base=stacked_overlay_base.dts
+    stacked_basedtb=stacked_overlay_base.fdtoverlay.test.dtb
+    stacked_bar=stacked_overlay_bar.dts
+    stacked_bardtb=stacked_overlay_bar.fdtoverlay.test.dtb
+    stacked_baz=stacked_overlay_baz.dts
+    stacked_bazdtb=stacked_overlay_baz.fdtoverlay.test.dtb
+    stacked_targetdtb=stacked_overlay_target.fdtoverlay.test.dtb
+
+    run_dtc_test -@ -I dts -O dtb -o $stacked_basedtb $stacked_base
+    run_dtc_test -@ -I dts -O dtb -o $stacked_bardtb $stacked_bar
+    run_dtc_test -@ -I dts -O dtb -o $stacked_bazdtb $stacked_baz
+
+    # test that baz correctly inserted the property
+    run_fdtoverlay_test baz "/foonode/barnode/baznode" "baz-property" "-ts" ${stacked_basedtb} ${stacked_targetdtb} ${stacked_bardtb} ${stacked_bazdtb}
+}
+
+pylibfdt_tests () {
+    TMP=/tmp/tests.stderr.$$
+    python pylibfdt_tests.py -v 2> $TMP
+
+    # Use the 'ok' message meaning the test passed, 'ERROR' meaning it failed
+    # and the summary line for total tests (e.g. 'Ran 17 tests in 0.002s').
+    # We could add pass + fail to get total tests, but this provides a useful
+    # sanity check.
+    pass_count=$(grep "\.\.\. ok$" $TMP | wc -l)
+    fail_count=$(grep "^ERROR: " $TMP | wc -l)
+    total_tests=$(sed -n 's/^Ran \([0-9]*\) tests.*$/\1/p' $TMP)
+    cat $TMP
+    rm $TMP
+
+    # Extract the test results and add them to our totals
+    tot_fail=$((tot_fail + $fail_count))
+    tot_pass=$((tot_pass + $pass_count))
+    tot_tests=$((tot_tests + $total_tests))
+}
+
 while getopts "vt:me" ARG ; do
     case $ARG in
 	"v")
@@ -681,7 +850,12 @@
 done
 
 if [ -z "$TESTSETS" ]; then
-    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget fdtput fdtdump"
+    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget fdtput fdtdump fdtoverlay"
+
+    # Test pylibfdt if the libfdt Python module is available.
+    if [ -f ../pylibfdt/_libfdt.so ]; then
+        TESTSETS="$TESTSETS pylibfdt"
+    fi
 fi
 
 # Make sure we don't have stale blobs lying around
@@ -710,6 +884,12 @@
 	"fdtdump")
 	    fdtdump_tests
 	    ;;
+	"pylibfdt")
+	    pylibfdt_tests
+	    ;;
+        "fdtoverlay")
+	    fdtoverlay_tests
+	    ;;
     esac
 done
 
@@ -724,3 +904,4 @@
 echo "* Strange test result:	$tot_strange"
 echo "**********"
 
+[ "$tot_tests" -eq "$tot_pass" ] || exit 1
diff -Nru device-tree-compiler-1.4.2/tests/setprop.c device-tree-compiler-1.4.5/tests/setprop.c
--- device-tree-compiler-1.4.2/tests/setprop.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/setprop.c	2017-09-27 10:00:10.000000000 +0000
@@ -66,7 +66,7 @@
 			     TEST_STRING_1);
 
 	verbose_printf("Old string value was \"%s\"\n", strp);
-	err = fdt_setprop(fdt, 0, "prop-str", NULL, 0);
+	err = fdt_setprop_empty(fdt, 0, "prop-str");
 	if (err)
 		FAIL("Failed to empty \"prop-str\": %s",
 		     fdt_strerror(err));
diff -Nru device-tree-compiler-1.4.2/tests/sized_cells.c device-tree-compiler-1.4.5/tests/sized_cells.c
--- device-tree-compiler-1.4.2/tests/sized_cells.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/sized_cells.c	2017-09-27 10:00:10.000000000 +0000
@@ -54,9 +54,9 @@
 				 TEST_CHAR4,
 				 TEST_CHAR5,
 				 TEST_VALUE_1 >> 24};
-	uint16_t expected_16[6];
-	uint32_t expected_32[6];
-	uint64_t expected_64[6];
+	fdt16_t expected_16[6];
+	fdt32_t expected_32[6];
+	fdt64_t expected_64[6];
 	int i;
 
 	for (i = 0; i < 5; ++i) {
diff -Nru device-tree-compiler-1.4.2/tests/stacked_overlay_bar.dts device-tree-compiler-1.4.5/tests/stacked_overlay_bar.dts
--- device-tree-compiler-1.4.2/tests/stacked_overlay_bar.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/stacked_overlay_bar.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+/ {
+	fragment@1 {
+		target = <&foo>;
+		__overlay__ {
+			overlay-1-property;
+			bar: barnode {
+				bar-property = "bar";
+			};
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/stacked_overlay_base.dts device-tree-compiler-1.4.5/tests/stacked_overlay_base.dts
--- device-tree-compiler-1.4.2/tests/stacked_overlay_base.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/stacked_overlay_base.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,6 @@
+/dts-v1/;
+/ {
+	foo: foonode {
+		foo-property = "foo";
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/stacked_overlay_baz.dts device-tree-compiler-1.4.5/tests/stacked_overlay_baz.dts
--- device-tree-compiler-1.4.2/tests/stacked_overlay_baz.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/stacked_overlay_baz.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+/ {
+	fragment@1 {
+		target = <&bar>;
+		__overlay__ {
+			overlay-2-property;
+			baz: baznode {
+				baz-property = "baz";
+			};
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/subnode_iterate.c device-tree-compiler-1.4.5/tests/subnode_iterate.c
--- device-tree-compiler-1.4.2/tests/subnode_iterate.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/subnode_iterate.c	2017-09-27 10:00:10.000000000 +0000
@@ -33,7 +33,7 @@
 
 static void test_node(void *fdt, int parent_offset)
 {
-	fdt32_t subnodes;
+	uint32_t subnodes;
 	const fdt32_t *prop;
 	int offset;
 	int count;
@@ -45,7 +45,7 @@
 		FAIL("Missing/invalid subnodes property at '%s'",
 		     fdt_get_name(fdt, parent_offset, NULL));
 	}
-	subnodes = cpu_to_fdt32(*prop);
+	subnodes = fdt32_to_cpu(*prop);
 
 	count = 0;
 	fdt_for_each_subnode(offset, fdt, parent_offset)
diff -Nru device-tree-compiler-1.4.2/tests/sw_tree1.c device-tree-compiler-1.4.5/tests/sw_tree1.c
--- device-tree-compiler-1.4.2/tests/sw_tree1.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/sw_tree1.c	2017-09-27 10:00:10.000000000 +0000
@@ -42,14 +42,14 @@
 	switch (alloc_mode) {
 	case FIXED:
 		if (!(*fdt))
-			fdt = xmalloc(*size);
+			*fdt = xmalloc(*size);
 		else
 			FAIL("Ran out of space");
 		return;
 
 	case RESIZE:
 		if (!(*fdt)) {
-			fdt = xmalloc(SPACE);
+			*fdt = xmalloc(SPACE);
 		} else if (*size < SPACE) {
 			*size += 1;
 			fdt_resize(*fdt, *fdt, *size);
@@ -85,6 +85,9 @@
 	size_t size;
 	int err;
 	bool created = false;
+	void *place;
+	const char place_str[] = "this is a placeholder string\0string2";
+	int place_len = sizeof(place_str);
 
 	test_init(argc, argv);
 
@@ -135,6 +138,8 @@
 	CHECK(fdt_begin_node(fdt, "subsubnode"));
 	CHECK(fdt_property(fdt, "compatible", "subsubnode1\0subsubnode",
 			   23));
+	CHECK(fdt_property_placeholder(fdt, "placeholder", place_len, &place));
+	memcpy(place, place_str, place_len);
 	CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_1));
 	CHECK(fdt_end_node(fdt));
 	CHECK(fdt_begin_node(fdt, "ss1"));
diff -Nru device-tree-compiler-1.4.2/tests/test_label_ref.dts device-tree-compiler-1.4.5/tests/test_label_ref.dts
--- device-tree-compiler-1.4.2/tests/test_label_ref.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/test_label_ref.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+/ {
+
+};
+
+label: &handle {
+
+};
diff -Nru device-tree-compiler-1.4.2/tests/tests.h device-tree-compiler-1.4.5/tests/tests.h
--- device-tree-compiler-1.4.2/tests/tests.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/tests.h	2017-09-27 10:00:10.000000000 +0000
@@ -99,7 +99,7 @@
 		    int len, const void *val);
 #define check_property_cell(fdt, nodeoffset, name, val) \
 	({ \
-		uint32_t x = cpu_to_fdt32(val);			      \
+		fdt32_t x = cpu_to_fdt32(val);			      \
 		check_property(fdt, nodeoffset, name, sizeof(x), &x); \
 	})
 
@@ -108,12 +108,12 @@
 			  int len, const void *val);
 #define check_getprop_cell(fdt, nodeoffset, name, val) \
 	({ \
-		uint32_t x = cpu_to_fdt32(val);			     \
+		fdt32_t x = cpu_to_fdt32(val);			     \
 		check_getprop(fdt, nodeoffset, name, sizeof(x), &x); \
 	})
 #define check_getprop_64(fdt, nodeoffset, name, val) \
 	({ \
-		uint64_t x = cpu_to_fdt64(val);			     \
+		fdt64_t x = cpu_to_fdt64(val);			     \
 		check_getprop(fdt, nodeoffset, name, sizeof(x), &x); \
 	})
 #define check_getprop_string(fdt, nodeoffset, name, s) \
diff -Nru device-tree-compiler-1.4.2/tests/tests.sh device-tree-compiler-1.4.5/tests/tests.sh
--- device-tree-compiler-1.4.2/tests/tests.sh	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/tests.sh	2017-09-27 10:00:10.000000000 +0000
@@ -22,6 +22,7 @@
 DTGET=../fdtget
 DTPUT=../fdtput
 FDTDUMP=../fdtdump
+FDTOVERLAY=../fdtoverlay
 
 verbose_run () {
     if [ -z "$QUIET_TEST" ]; then
diff -Nru device-tree-compiler-1.4.2/tests/test_tree1.dts device-tree-compiler-1.4.5/tests/test_tree1.dts
--- device-tree-compiler-1.4.2/tests/test_tree1.dts	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/test_tree1.dts	2017-09-27 10:00:10.000000000 +0000
@@ -18,6 +18,7 @@
 
 		subsubnode {
 			compatible = "subsubnode1", "subsubnode";
+			placeholder = "this is a placeholder string", "string2";
 			prop-int = <0xdeadbeef>;
 		};
 
diff -Nru device-tree-compiler-1.4.2/tests/test_tree1_label_noderef.dts device-tree-compiler-1.4.5/tests/test_tree1_label_noderef.dts
--- device-tree-compiler-1.4.2/tests/test_tree1_label_noderef.dts	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/test_tree1_label_noderef.dts	2017-09-27 10:00:10.000000000 +0000
@@ -18,6 +18,7 @@
 
 		subsubnode {
 			compatible = "subsubnode1", "subsubnode";
+			placeholder = "this is a placeholder string", "string2";
 			prop-int = <0xdeadbeef>;
 		};
 
diff -Nru device-tree-compiler-1.4.2/tests/trees.S device-tree-compiler-1.4.5/tests/trees.S
--- device-tree-compiler-1.4.2/tests/trees.S	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/trees.S	2017-09-27 10:00:10.000000000 +0000
@@ -102,6 +102,7 @@
 
 	BEGIN_NODE("subsubnode")
 	PROP_STR(test_tree1, compatible, "subsubnode1\0subsubnode")
+	PROP_STR(test_tree1, placeholder, "this is a placeholder string\0string2")
 	PROP_INT(test_tree1, prop_int, TEST_VALUE_1)
 	END_NODE
 
@@ -141,6 +142,7 @@
 	STRING(test_tree1, linux_phandle, "linux,phandle")
 	STRING(test_tree1, phandle, "phandle")
 	STRING(test_tree1, reg, "reg")
+	STRING(test_tree1, placeholder, "placeholder")
 	STRING(test_tree1, address_cells, "#address-cells")
 	STRING(test_tree1, size_cells, "#size-cells")
 test_tree1_strings_end:
diff -Nru device-tree-compiler-1.4.2/tests/unit-addr-leading-0s.dts device-tree-compiler-1.4.5/tests/unit-addr-leading-0s.dts
--- device-tree-compiler-1.4.2/tests/unit-addr-leading-0s.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/unit-addr-leading-0s.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	bus {
+		node@001 {
+			reg = <1 0>;
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/unit-addr-leading-0x.dts device-tree-compiler-1.4.5/tests/unit-addr-leading-0x.dts
--- device-tree-compiler-1.4.2/tests/unit-addr-leading-0x.dts	1970-01-01 00:00:00.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/unit-addr-leading-0x.dts	2017-09-27 10:00:10.000000000 +0000
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	bus {
+		node@0x1 {
+			reg = <1 0>;
+		};
+	};
+};
diff -Nru device-tree-compiler-1.4.2/tests/value-labels.c device-tree-compiler-1.4.5/tests/value-labels.c
--- device-tree-compiler-1.4.2/tests/value-labels.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/tests/value-labels.c	2017-09-27 10:00:10.000000000 +0000
@@ -36,13 +36,13 @@
 	int propoff;
 };
 
-struct val_label labels1[] = {
+static struct val_label labels1[] = {
 	{ "start1", 0 },
 	{ "mid1", 2 },
 	{ "end1", -1 },
 };
 
-struct val_label labels2[] = {
+static struct val_label labels2[] = {
 	{ "start2", 0 },
 	{ "innerstart2", 0 },
 	{ "innermid2", 4 },
@@ -50,7 +50,7 @@
 	{ "end2", -1 },
 };
 
-struct val_label labels3[] = {
+static struct val_label labels3[] = {
 	{ "start3", 0 },
 	{ "innerstart3", 0 },
 	{ "innermid3", 1 },
diff -Nru device-tree-compiler-1.4.2/.travis.yml device-tree-compiler-1.4.5/.travis.yml
--- device-tree-compiler-1.4.2/.travis.yml	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/.travis.yml	2017-09-27 10:00:10.000000000 +0000
@@ -1,5 +1,30 @@
 language: c
 
+# Coverity Scan uploads
+env:
+  global:
+  # COVERITY_SCAN_TOKEN (dgibson/dtc)
+  - secure: "vlHvXe618//IM9LQaKzqsrUbjs7ng0L9UCST4kJbJnFQDXvVe5JiSmJGd4ef7mm0NUv5bMRl2W3xCiu6BYAu/NvU3tMNHoLG+JgCJs0+wLJXbWOwji/NmH7olqgJG+CmpaCMXjARF6+nrTnBYHJL6cYyf4KVoV4B0I/hLUW91+s="
+
+matrix:
+  include:
+    - addons:
+        apt:
+          packages:
+            - swig
+            - python-dev
+        coverity_scan:
+          project:
+            name: dtc
+            description: Device Tree Compiler
+          notification_email: david@gibson.dropbear.id.au
+          build_command: make
+          branch_pattern: coverity_scan
+
+    - addons:
+        apt:
+          packages:
+
 script:
         - make
         - make check
diff -Nru device-tree-compiler-1.4.2/treesource.c device-tree-compiler-1.4.5/treesource.c
--- device-tree-compiler-1.4.2/treesource.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/treesource.c	2017-09-27 10:00:10.000000000 +0000
@@ -25,12 +25,12 @@
 extern int yyparse(void);
 extern YYLTYPE yylloc;
 
-struct boot_info *the_boot_info;
+struct dt_info *parser_output;
 bool treesource_error;
 
-struct boot_info *dt_from_source(const char *fname)
+struct dt_info *dt_from_source(const char *fname)
 {
-	the_boot_info = NULL;
+	parser_output = NULL;
 	treesource_error = false;
 
 	srcfile_push(fname);
@@ -43,7 +43,7 @@
 	if (treesource_error)
 		die("Syntax error parsing input tree\n");
 
-	return the_boot_info;
+	return parser_output;
 }
 
 static void write_prefix(FILE *f, int level)
@@ -137,7 +137,7 @@
 static void write_propval_cells(FILE *f, struct data val)
 {
 	void *propend = val.val + val.len;
-	cell_t *cp = (cell_t *)val.val;
+	fdt32_t *cp = (fdt32_t *)val.val;
 	struct marker *m = val.markers;
 
 	fprintf(f, "<");
@@ -263,22 +263,22 @@
 }
 
 
-void dt_to_source(FILE *f, struct boot_info *bi)
+void dt_to_source(FILE *f, struct dt_info *dti)
 {
 	struct reserve_info *re;
 
 	fprintf(f, "/dts-v1/;\n\n");
 
-	for (re = bi->reservelist; re; re = re->next) {
+	for (re = dti->reservelist; re; re = re->next) {
 		struct label *l;
 
 		for_each_label(re->labels, l)
 			fprintf(f, "%s: ", l->label);
 		fprintf(f, "/memreserve/\t0x%016llx 0x%016llx;\n",
-			(unsigned long long)re->re.address,
-			(unsigned long long)re->re.size);
+			(unsigned long long)re->address,
+			(unsigned long long)re->size);
 	}
 
-	write_tree_source_node(f, bi->dt, 0);
+	write_tree_source_node(f, dti->dt, 0);
 }
 
diff -Nru device-tree-compiler-1.4.2/util.c device-tree-compiler-1.4.5/util.c
--- device-tree-compiler-1.4.2/util.c	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/util.c	2017-09-27 10:00:10.000000000 +0000
@@ -396,7 +396,7 @@
 		} while (s < data + len);
 
 	} else if ((len % 4) == 0) {
-		const uint32_t *cell = (const uint32_t *)data;
+		const fdt32_t *cell = (const fdt32_t *)data;
 
 		printf(" = <");
 		for (i = 0, len /= 4; i < len; i++)
@@ -412,15 +412,16 @@
 	}
 }
 
-void util_version(void)
+void NORETURN util_version(void)
 {
 	printf("Version: %s\n", DTC_VERSION);
 	exit(0);
 }
 
-void util_usage(const char *errmsg, const char *synopsis,
-		const char *short_opts, struct option const long_opts[],
-		const char * const opts_help[])
+void NORETURN util_usage(const char *errmsg, const char *synopsis,
+			 const char *short_opts,
+			 struct option const long_opts[],
+			 const char * const opts_help[])
 {
 	FILE *fp = errmsg ? stderr : stdout;
 	const char a_arg[] = "<arg>";
diff -Nru device-tree-compiler-1.4.2/util.h device-tree-compiler-1.4.5/util.h
--- device-tree-compiler-1.4.2/util.h	2016-09-03 11:02:30.000000000 +0000
+++ device-tree-compiler-1.4.5/util.h	2017-09-27 10:00:10.000000000 +0000
@@ -25,9 +25,17 @@
  *                                                                   USA
  */
 
+#ifdef __GNUC__
+#define PRINTF(i, j)	__attribute__((format (printf, i, j)))
+#define NORETURN	__attribute__((noreturn))
+#else
+#define PRINTF(i, j)
+#define NORETURN
+#endif
+
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-static inline void __attribute__((noreturn)) die(const char *str, ...)
+static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
 {
 	va_list ap;
 
@@ -53,13 +61,14 @@
 	void *new = realloc(p, len);
 
 	if (!new)
-		die("realloc() failed (len=%d)\n", len);
+		die("realloc() failed (len=%zd)\n", len);
 
 	return new;
 }
 
 extern char *xstrdup(const char *s);
-extern int xasprintf(char **strp, const char *fmt, ...);
+
+extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
 extern char *join_path(const char *path, const char *name);
 
 /**
@@ -188,7 +197,7 @@
 /**
  * Show source version and exit
  */
-void util_version(void) __attribute__((noreturn));
+void NORETURN util_version(void);
 
 /**
  * Show usage and exit
@@ -202,9 +211,10 @@
  * @param long_opts	The structure of long options
  * @param opts_help	An array of help strings (should align with long_opts)
  */
-void util_usage(const char *errmsg, const char *synopsis,
-		const char *short_opts, struct option const long_opts[],
-		const char * const opts_help[]) __attribute__((noreturn));
+void NORETURN util_usage(const char *errmsg, const char *synopsis,
+			 const char *short_opts,
+			 struct option const long_opts[],
+			 const char * const opts_help[]);
 
 /**
  * Show usage and exit