1 files changed, 30 insertions, 1 deletions

diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index 3673de07e4e5..6846ad2fd6d2 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -216,6 +216,28 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
         return old_node;
 }
 
+void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
+{
+        static unsigned int next_orphan_fragment = 0;
+        struct node *node;
+        struct property *p;
+        struct data d = empty_data;
+        char *name;
+
+        d = data_add_marker(d, REF_PHANDLE, ref);
+        d = data_append_integer(d, 0xffffffff, 32);
+
+        p = build_property("target", d);
+
+        xasprintf(&name, "fragment@%u",
+                        next_orphan_fragment++);
+        name_node(new_node, "__overlay__");
+        node = build_node(p, new_node);
+        name_node(node, name);
+
+        add_child(dt, node);
+}
+
 struct node *chain_node(struct node *first, struct node *list)
 {
         assert(first->next_sibling == NULL);
@@ -396,6 +418,12 @@ cell_t propval_cell(struct property *prop)
         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,
                                        struct node **node)
 {
@@ -478,7 +506,8 @@ struct node *get_node_by_path(struct node *tree, const char *path)
         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;