[Crosstoolchain-logs] [device-tree-compiler] 104/357: dtc: Accept NOPs in dtb input regardless of version

[Hector Oron]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch upstream/1.3.x
in repository device-tree-compiler.

commit 0738774fcc34b78a708a127fb4b2f193d08c94ba
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Tue Jun 26 11:30:47 2007 +1000

    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 at gibson.dropbear.id.au>
---
 flattree.c | 6 ++++--
 1 file 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:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git