diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-28 21:25:59 +0000 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-10-01 11:11:35 -0500 |
| commit | cd296721a9645f9f28800a072490fa15458d1fb7 (patch) | |
| tree | 492b9a268a48af07844fbbd39519f95676ee73fe /scripts/dtc/flattree.c | |
| parent | acc2097934b5403b97f95763fe99fc115b818061 (diff) | |
dtc: import latest upstream dtc
This updates scripts/dtc to commit 317a5d9 "dtc: zero out new label
objects" from git://git.jdl.com/software/dtc.git.
This adds features such as:
* /bits/ syntax for cell data.
* Math expressions within cell data.
* The ability to delete properties or nodes.
* Support for #line directives in the input file, which allows the use of
cpp on *.dts.
* -i command-line option (/include/ path)
* -W/-E command-line options for error/warning control.
* Removal of spew to STDOUT containing the filename being compiled.
* Many additions to the libfdt API.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'scripts/dtc/flattree.c')
| -rw-r--r-- | scripts/dtc/flattree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c index 28d0b2381df..665dad7bb46 100644 --- a/scripts/dtc/flattree.c +++ b/scripts/dtc/flattree.c @@ -263,6 +263,9 @@ static void flatten_tree(struct node *tree, struct emitter *emit, struct node *child; int seen_name_prop = 0; + if (tree->deleted) + return; + emit->beginnode(etarget, tree->labels); if (vi->flags & FTF_FULLPATH) |