scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987

[u-boot] / scripts / dtc / dtc-parser.y

diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y
index affc81a8f9abedc2dec26bd8f713aac337e2ac6e..44af170abfeaca34a94217d0cf7519568e27b72a 100644 (file)
--- a/scripts/dtc/dtc-parser.y
+++ b/scripts/dtc/dtc-parser.y
@@ -166,7 +166,17 @@ devicetree:
                {
                        $$ = merge_nodes($1, $3);
                }
-
+       | DT_REF nodedef
+               {
+                       /*
+                        * We rely on the rule being always:
+                        *   versioninfo plugindecl memreserves devicetree
+                        * so $-1 is what we want (plugindecl)
+                        */
+                       if (!($<flags>-1 & DTSF_PLUGIN))
+                               ERROR(&@2, "Label or path %s not found", $1);
+                       $$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1);
+               }
        | devicetree DT_LABEL DT_REF nodedef
                {
                        struct node *target = get_node_by_ref($1, $3);
@@ -209,11 +219,6 @@ devicetree:
 
                        $$ = $1;
                }
-       | /* empty */
-               {
-                       /* build empty node */
-                       $$ = name_node(build_node(NULL, NULL), "");
-               }
        ;
 
 nodedef: