scripts/dtc: Update to upstream version v1.4.7-57-gf267e674d145

This adds the following commits from upstream:

f267e674d145 checks: Fix crash with multiple source annotations
3616b9a811b6 checks: Use source position information for check failures
2bdbd07a1223 checks: Make each message output atomic
a1eff70c02cf util: Add xa{v}sprintf_append functions
82a52ce4573b libfdt: Add a test for fdt_getprop_by_offset()
607b8586b383 PEP8 / Flake8 cleanups for setup.py
f9c0a425b648 Remove broken objdir / srcdir support
5182b5e6f28c pylibfdt: Use common PREFIX variable
d45bf1f5f2a6 Refine make tests_clean target
99284c4db9cb Refine pylibfdt_clean target
a4629cfaedfb Refine libfdt_clean target
08380fc43aa2 tests: Use modern octal literals for Python
8113c00b99d3 pylibfdt: Allow switch to Python 3 via environment variable PYTHON
11738cf01f15 libfdt: Don't use memcpy to handle unaligned reads on ARM
86a288a73670 checks: Restructure check_msg to decrease indentation
5667e7ef9a9a annotations: add the annotation functionality
8e20ccf52f90 annotations: add positions
ca930e20bb54 tests: Don't lose errors from make checkm
43366bb4eeee tests: Property count valgrind errors in wrapped tests
5062516fb8cb srcpos: Remove srcpos_empty
a3143fafbf83 Revert "annotations: add positions"
403cc79f06a1 checks: Update SPI bus check for 'spi-slave'
baa1d2cf7894 annotations: add positions
ff2ad38f6a5a Merge remote-tracking branch 'origin/pr/18'
aa7254d9cb17 libfdt: return correct value if #size-cells property is not present
49903aed7783 use ptrdiff_t modifier for printing pointer differences
da2b691ccf68 treesource: Fix dts output for phandles in middle of a sequence of ints
8f8b77a0d62d tests: Wrap check_align() calls with base_run_test()
522d81d572f2 Fix dts output with a REF_PATH marker
e45198c98359 Added test cases for target references
0fcffda15e9f Merge nodes with local target label references
1e4a0928f3b3 pylibfdt: Don't have setup.py depend on where it's invoked from
ca399b14956f pylibfdt: Eliminate run_setup make function
98972f1b3e33 pylibfdt: Improved version extraction
7ba2be6cda5f pylibfdt: Don't silence setup.py when V=1
7691f9d39301 pylibfdt: Make SETUP make variable
855b9963def9 pylibfdt: Simpler CFLAGS handling
47cafbeeb977 pylibfdt: Link extension module with libfdt rather than rebuilding
dd695d6afb19 pylibfdt: Correctly set build output directory
59327523d0d8 pylibfdt: We don't need include files from the base directory
e84742aa7b93 checks: fix simple-bus compatible matching
8c59a97ce096 Fix missing labels when emitting dts format
d448f9a5fd94 Revert dts output formatting changes of spaces around brackets

Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 22 insertions, 11 deletions

diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index 4ff0679e0062..7a2e6446a17b 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -19,6 +19,7 @@
  */
 
 #include "dtc.h"
+#include "srcpos.h"
 
 /*
  * Tree building functions
@@ -50,7 +51,8 @@ void delete_labels(struct label **labels)
                 label->deleted = 1;
 }
 
-struct property *build_property(char *name, struct data val)
+struct property *build_property(char *name, struct data val,
+                                struct srcpos *srcpos)
 {
         struct property *new = xmalloc(sizeof(*new));
 
@@ -58,6 +60,7 @@ struct property *build_property(char *name, struct data val)
 
         new->name = name;
         new->val = val;
+        new->srcpos = srcpos_copy(srcpos);
 
         return new;
 }
@@ -97,7 +100,8 @@ struct property *reverse_properties(struct property *first)
         return head;
 }
 
-struct node *build_node(struct property *proplist, struct node *children)
+struct node *build_node(struct property *proplist, struct node *children,
+                        struct srcpos *srcpos)
 {
         struct node *new = xmalloc(sizeof(*new));
         struct node *child;
@@ -106,6 +110,7 @@ struct node *build_node(struct property *proplist, struct node *children)
 
         new->proplist = reverse_properties(proplist);
         new->children = children;
+        new->srcpos = srcpos_copy(srcpos);
 
         for_each_child(new, child) {
                 child->parent = new;
@@ -114,13 +119,14 @@ struct node *build_node(struct property *proplist, struct node *children)
         return new;
 }
 
-struct node *build_node_delete(void)
+struct node *build_node_delete(struct srcpos *srcpos)
 {
         struct node *new = xmalloc(sizeof(*new));
 
         memset(new, 0, sizeof(*new));
 
         new->deleted = 1;
+        new->srcpos = srcpos_copy(srcpos);
 
         return new;
 }
@@ -183,6 +189,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
 
                                 old_prop->val = new_prop->val;
                                 old_prop->deleted = 0;
+                                free(old_prop->srcpos);
+                                old_prop->srcpos = new_prop->srcpos;
                                 free(new_prop);
                                 new_prop = NULL;
                                 break;
@@ -223,6 +231,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                         add_child(old_node, new_child);
         }
 
+        old_node->srcpos = srcpos_extend(old_node->srcpos, new_node->srcpos);
+
         /* The new node contents are now merged into the old node.  Free
          * the new node. */
         free(new_node);
@@ -241,18 +251,18 @@ struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
         if (ref[0] == '/') {
                 d = data_append_data(d, ref, strlen(ref) + 1);
 
-                p = build_property("target-path", d);
+                p = build_property("target-path", d, NULL);
         } else {
                 d = data_add_marker(d, REF_PHANDLE, ref);
                 d = data_append_integer(d, 0xffffffff, 32);
 
-                p = build_property("target", d);
+                p = build_property("target", d, NULL);
         }
 
         xasprintf(&name, "fragment@%u",
                         next_orphan_fragment++);
         name_node(new_node, "__overlay__");
-        node = build_node(p, new_node);
+        node = build_node(p, new_node, NULL);
         name_node(node, name);
 
         add_child(dt, node);
@@ -351,7 +361,7 @@ void append_to_property(struct node *node,
                 p->val = d;
         } else {
                 d = data_append_data(empty_data, data, len);
-                p = build_property(name, d);
+                p = build_property(name, d, NULL);
                 add_property(node, p);
         }
 }
@@ -609,11 +619,11 @@ cell_t get_node_phandle(struct node *root, struct node *node)
 
         if (!get_property(node, "linux,phandle")
             && (phandle_format & PHANDLE_LEGACY))
-                add_property(node, build_property("linux,phandle", d));
+                add_property(node, build_property("linux,phandle", d, NULL));
 
         if (!get_property(node, "phandle")
             && (phandle_format & PHANDLE_EPAPR))
-                add_property(node, build_property("phandle", d));
+                add_property(node, build_property("phandle", d, NULL));
 
         /* If the node *does* have a phandle property, we must
          * be dealing with a self-referencing phandle, which will be
@@ -787,7 +797,7 @@ static struct node *build_and_name_child_node(struct node *parent, char *name)
 {
         struct node *node;
 
-        node = build_node(NULL, NULL);
+        node = build_node(NULL, NULL, NULL);
         name_node(node, xstrdup(name));
         add_child(parent, node);
 
@@ -849,7 +859,8 @@ static void generate_label_tree_internal(struct dt_info *dti,
                         /* insert it */
                         p = build_property(l->label,
                                 data_copy_mem(node->fullpath,
-                                                strlen(node->fullpath) + 1));
+                                                strlen(node->fullpath) + 1),
+                                NULL);
                         add_property(an, p);
                 }