diff options
| author | John Bonesio <bones@secretlab.ca> | 2010-11-02 15:55:04 -0700 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2010-11-13 14:44:06 -0600 |
| commit | 73ae43ea44a40c2ac00dd94523f270177a1e72e9 (patch) | |
| tree | 43362bbc2f133e2b5880fbad9b3829c716ec7698 /dtc-parser.y | |
| parent | c0fa2e6d4e59e62f2e9f23db1a2d94532fa4ae98 (diff) | |
| download | dtc-73ae43ea44a40c2ac00dd94523f270177a1e72e9.tar.gz | |
Allow nodes to be referenced by path at the top level.
When nodes are modified by merging device trees, nodes to be updated/merged can
be specified by a label. Specifying nodes by full path (instead of label)
doesn't quite work. This patch fixes that.
Signed-off-by: John Bonesio <bones@secretlab.ca>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'dtc-parser.y')
| -rw-r--r-- | dtc-parser.y | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dtc-parser.y b/dtc-parser.y index b58ba8e..5e84a67 100644 --- a/dtc-parser.y +++ b/dtc-parser.y @@ -131,13 +131,12 @@ devicetree: } | devicetree DT_REF nodedef { - struct node *target; + struct node *target = get_node_by_ref($1, $2); - target = get_node_by_label($1, $2); if (target) merge_nodes(target, $3); else - print_error("label, '%s' not found", $2); + print_error("label or path, '%s', not found", $2); $$ = $1; } ; |