aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-06-26 11:30:47 +1000
committerJon Loeliger <jdl@freescale.com>2007-06-25 21:39:26 -0500
commit0738774fcc34b78a708a127fb4b2f193d08c94ba (patch)
treed1561ad22786682806971532ea97283fb41897ac
parent12578976fe9cef82f0c08db3f9a4f550f5085ba4 (diff)
downloaddtc-0738774fcc34b78a708a127fb4b2f193d08c94ba.zip
dtc-0738774fcc34b78a708a127fb4b2f193d08c94ba.tar.gz
dtc-0738774fcc34b78a708a127fb4b2f193d08c94ba.tar.bz2
dtc: Accept NOPs in dtb input regardless of version
Since Milton's patch, dtc will accept (and, correctly, ignore) NOP tags when given dtb input v16 or later. However, although NOPs weren't defined in earlier versions, they're not ambiguous, so should be accepted there as well. This patch does so, printing a mere warning when finding NOPs in a too-early dtb version. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--flattree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/flattree.c b/flattree.c
index b802e2c..412177f 100644
--- a/flattree.c
+++ b/flattree.c
@@ -776,10 +776,12 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
break;
case OF_DT_NOP:
- if (flags & FTF_NOPS)
+ if (!(flags & FTF_NOPS))
+ fprintf(stderr, "Warning: NOP tag found in flat tree"
+ " version <16\n");
break;
- die("OF_DT_NOP in device tree blob\n");
+ /* Ignore */
break;
default: