scripts/dtc: Update to upstream version v1.4.6-21-g84e414b

This adds the following commits from upstream:

84e414b tests: Add a test case for the omit-if-no-ref keyword
4038fd9 dtc: add ability to make nodes conditional on them being referenced
e1f139e checks: drop warning for missing PCI bridge bus-range
f4eba68 checks: Print duplicate node name instead of parent name
46df1fb .travis.yml: Run valgrind checks via Travis
14a3002 tests: Update valgrind suppressions for sw_tree1
02c5fe9 tests: Remove valgrind error from tests/get_path
df53683 checks: add graph binding checks
2347c96 checks: add a check for duplicate unit-addresses of child nodes
8f1b35f Correct overlay syntactic sugar for generating target-path fragments
afbddcd Suppress warnings on overlay fragments
119e273 Improve tests for dtc overlay generation
aadd0b6 checks: centralize printing of property names in failure messages
88960e3 checks: centralize printing of node path in check_msg
f1879e1 Add limited read-only support for older (V2 and V3) device tree to libfdt.
37dea76 srcpos: drop special handling of tab
65893da libfdt: overlay: Add missing license
962a45c Avoid installing pylibfdt when dependencies are missing
cd6ea1b Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}
51b3a16 Makefile.tests: Add LIBDL make(1) variable for portability sake
333d533 Attempt to auto-detect stat(1) being used if not given proper invocation
e543880 dtc: Bump version to v1.4.6
a1fe86f fdtoverlay: Switch from using alloca to malloc
c8d5472 tests: Improve compatibility with other platforms
c81d389 checks: add chosen node checks
e671852 checks: add aliases node checks
d0c44eb checks: check for #{size,address}-cells without child nodes
18a3d84 checks: add string list check for *-names properties
8fe94fd checks: add string list check
6c57308 checks: add a string check for 'label' property
a384191 checks: fix sound-dai phandle with arg property check
b260c4f Fix ambiguous grammar for devicetree rule
fe667e3 tests: Add some basic tests for the pci_bridge checks
7975f64 Fix widespread incorrect use of strneq(), replace with new strprefixeq()
fca2964 Add strstarts() helper function
cc392f0 tests: Check non-matching cases for fdt_node_check_compatible()
bba26a5 livetree: avoid assertion of orphan phandles with overlays
c8f8194 implement strnlen for systems that need it
c8b38f6 libfdt: Remove leading underscores from identifiers
3b62fda Remove leading underscores from identifiers
2d45d1c Replace FDT_VERSION() with stringify()
2e6fe5a Fix some errors in comments
b0ae9e4 tests: Correct warning in sw_tree1.c
c1e55a5 checks: fix handling of unresolved phandles for dts plugins
f8872e2 tests: Avoid 64-bit arithmetic in assembler
48c91c0 libfdt: add stringlist functions to linker script
b1a6003 tests: Add a test for overlays syntactic sugar
737b2df overlay: Add syntactic sugar version of overlays
497432f checks: Use proper format modifier for size_t
22a65c5 dtc: Bump version to v1.4.5
c575d80 Add fdtoverlay to .gitignore
b6a6f94 fdtoverlay: Sanity check blob size
8c1eb15 pylibfdt: Use Python2 explicitly
ee3d26f checks: add interrupts property check
c1e7738 checks: add gpio binding properties check
b3bbac0 checks: add phandle with arg property checks
fe50bd1 fdtget: Split out cell list display into a new function
62d8123 README: Add a note about test_tree1.dts
5bed86a pylibfdt: Add support for fdt_subnode_offset()
46f31b6 pylibfdt: Add support for fdt_node_offset_by_phandle()
a3ae437 pylibfdt: Add support for fdt_parent_offset()
a198af8 pylibfdt: Add support for fdt_get_phandle()
b9eba92 tests: Return a failure code when any tests fail
155faf6 pylibfdt: Use local pylibfdt module
50e5cd0 pylibfdt: Add a test for use of uint32_t
ab78860 pylibfdt: Add stdint include to fix uint32_t
36f511f tests: Add stacked overlay tests on fdtoverlay
1bb0065 fdt: Allow stacked overlays phandle references
a33c224 Introduce fdt_setprop_placeholder() method
0016f8c dtc: change default phandles to ePAPR style instead of both
e3b9a95 tests: fdtoverlay unit test
4240914 fdtoverlay: A tool that applies overlays
aae2272 manual: Document missing options
13ce6e1 dtc: fix sprintf() format string error, again
d990b80 Makefile: Fix build on MSYS2 and Cygwin
51f56de Clean up shared library compile/link options
21a2bc8 Suppress expected error message in fdtdump test
2a42b14 dtc: check.c fix compile error
a10cb3c Fix get_node_by_path string equality check
548aea2 fdtdump: Discourage use of fdtdump
c225884 fdtdump: Fix over-zealous version check
9067ee4 Fix a few whitespace and style nits
e56f2b0 pylibfdt: Use setup.py to build the swig file
896f1c1 pylibfdt: Use Makefile constructs to implement NO_PYTHON
90db6d9 pylibfdt: Allow setup.py to operate stand-alone
e20d965 Add Coverity Scan support
b04a2cf pylibfdt: Fix code style in setup.py
1c5170d pylibfdt: Rename libfdt.swig to libfdt.i
580a9f6 Add a libfdt function to write a property placeholder
ab15256 pylibfdt: Use the call function to simplify the Makefile
9f2e3a3 pylibfdt: Use the correct libfdt version in the module
e91c652 pylibfdt: Enable installation of Python module
8a892fd pylibfdt: Allow building to be disabled
741cdff .travis.yml: Add builds with and without Python library prerequisites
14c4171 pylibfdt: Use package_dir to set the package directory
89a5062 pylibfdt: Use environment to pass C flags and files
4e0e0d0 pylibfdt: Allow pkg-config to be supplied in the environment
6afd7d9 Correct typo: s/pylibgfdt/pylibfdt/

Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>

Author: cristibirsan

scripts/dtc/checks.c

@@ -153,6 +153,13 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
 			return DT_DEL_NODE;
 		}
 
+<*>"/omit-if-no-ref/"	{
+			DPRINT("Keyword: /omit-if-no-ref/\n");
+			DPRINT("<PROPNODENAME>\n");
+			BEGIN(PROPNODENAME);
+			return DT_OMIT_NO_REF;
+		}
+
 <*>{LABEL}:	{
 			DPRINT("Label: %s\n", yytext);
 			yylval.labelref = xstrdup(yytext);

scripts/dtc/dtc-lexer.l

@@ -59,14 +59,15 @@ extern int yydebug;
     DT_BITS = 269,
     DT_DEL_PROP = 270,
     DT_DEL_NODE = 271,
-    DT_PROPNODENAME = 272,
-    DT_LITERAL = 273,
-    DT_CHAR_LITERAL = 274,
-    DT_BYTE = 275,
-    DT_STRING = 276,
-    DT_LABEL = 277,
-    DT_REF = 278,
-    DT_INCBIN = 279
+    DT_OMIT_NO_REF = 272,
+    DT_PROPNODENAME = 273,
+    DT_LITERAL = 274,
+    DT_CHAR_LITERAL = 275,
+    DT_BYTE = 276,
+    DT_STRING = 277,
+    DT_LABEL = 278,
+    DT_REF = 279,
+    DT_INCBIN = 280
   };
 #endif
 
@@ -95,7 +96,7 @@ union YYSTYPE
 	uint64_t integer;
 	unsigned int flags;
 
-#line 99 "dtc-parser.tab.h" /* yacc.c:1909  */
+#line 100 "dtc-parser.tab.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;

scripts/dtc/dtc-lexer.lex.c_shipped

@@ -63,6 +63,7 @@ extern bool treesource_error;
 %token DT_BITS
 %token DT_DEL_PROP
 %token DT_DEL_NODE
+%token DT_OMIT_NO_REF
 %token <propnodename> DT_PROPNODENAME
 %token <integer> DT_LITERAL
 %token <integer> DT_CHAR_LITERAL
@@ -166,7 +167,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);
@@ -180,12 +191,21 @@ devicetree:
 		}
 	| devicetree DT_REF nodedef
 		{
-			struct node *target = get_node_by_ref($1, $2);
+			/*
+			 * We rely on the rule being always:
+			 *   versioninfo plugindecl memreserves devicetree
+			 * so $-1 is what we want (plugindecl)
+			 */
+			if ($<flags>-1 & DTSF_PLUGIN) {
+				add_orphan_node($1, $3, $2);
+			} else {
+				struct node *target = get_node_by_ref($1, $2);
 
-			if (target)
-				merge_nodes(target, $3);
-			else
-				ERROR(&@2, "Label or path %s not found", $2);
+				if (target)
+					merge_nodes(target, $3);
+				else
+					ERROR(&@2, "Label or path %s not found", $2);
+			}
 			$$ = $1;
 		}
 	| devicetree DT_DEL_NODE DT_REF ';'
@@ -198,6 +218,18 @@ devicetree:
 				ERROR(&@3, "Label or path %s not found", $3);
 
 
+			$$ = $1;
+		}
+	| devicetree DT_OMIT_NO_REF DT_REF ';'
+		{
+			struct node *target = get_node_by_ref($1, $3);
+
+			if (target)
+				omit_node_if_unused(target);
+			else
+				ERROR(&@3, "Label or path %s not found", $3);
+
+
 			$$ = $1;
 		}
 	;
@@ -504,6 +536,10 @@ subnode:
 		{
 			$$ = name_node(build_node_delete(), $2);
 		}
+	| DT_OMIT_NO_REF subnode
+		{
+			$$ = omit_node_if_unused($2);
+		}
 	| DT_LABEL subnode
 		{
 			add_label(&$2->labels, $1);

scripts/dtc/dtc-parser.tab.c_shipped

@@ -31,7 +31,7 @@ int reservenum;		/* Number of memory reservation slots */
 int minsize;		/* Minimum blob size */
 int padsize;		/* Additional padding to blob */
 int alignsize;		/* Additional padding to blob accroding to the alignsize */
-int phandle_format = PHANDLE_BOTH;	/* Use linux,phandle or phandle properties */
+int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties */
 int generate_symbols;	/* enable symbols & fixup support */
 int generate_fixups;		/* suppress generation of fixups on symbol support */
 int auto_label_aliases;		/* auto generate labels -> aliases */
@@ -59,8 +59,6 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
 }
 
 /* Usage related data. */
-#define FDT_VERSION(version)	_FDT_VERSION(version)
-#define _FDT_VERSION(version)	#version
 static const char usage_synopsis[] = "dtc [options] <input file>";
 static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
 static struct option const usage_long_opts[] = {
@@ -98,7 +96,7 @@ static const char * const usage_opts_help[] = {
 	 "\t\tdts - device tree source text\n"
 	 "\t\tdtb - device tree blob\n"
 	 "\t\tasm - assembler source",
-	"\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
+	"\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
 	"\n\tOutput dependency file",
 	"\n\tMake space for <number> reserve map entries (for dtb and asm output)",
 	"\n\tMake the blob at least <bytes> long (extra space)",
@@ -319,13 +317,14 @@ int main(int argc, char *argv[])
 		dti->boot_cpuid_phys = cmdline_boot_cpuid;
 
 	fill_fullpaths(dti->dt, "");
-	process_checks(force, dti);
 
 	/* on a plugin, generate by default */
 	if (dti->dtsflags & DTSF_PLUGIN) {
 		generate_fixups = 1;
 	}
 
+	process_checks(force, dti);
+
 	if (auto_label_aliases)
 		generate_label_tree(dti, "aliases", false);
 

scripts/dtc/dtc-parser.tab.h_shipped

@@ -1,5 +1,5 @@
-#ifndef _DTC_H
-#define _DTC_H
+#ifndef DTC_H
+#define DTC_H
 
 /*
  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
@@ -31,6 +31,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <libfdt_env.h>
 #include <fdt.h>
@@ -66,7 +67,8 @@ typedef uint32_t cell_t;
 
 
 #define streq(a, b)	(strcmp((a), (b)) == 0)
-#define strneq(a, b, n)	(strncmp((a), (b), (n)) == 0)
+#define strstarts(s, prefix)	(strncmp((s), (prefix), strlen(prefix)) == 0)
+#define strprefixeq(a, n, b)	(strlen(b) == (n) && (memcmp(a, b, n) == 0))
 
 #define ALIGN(x, a)	(((x) + (a) - 1) & ~((a) - 1))
 
@@ -166,6 +168,8 @@ struct node {
 
 	struct label *labels;
 	const struct bus_type *bus;
+
+	bool omit_if_unused, is_referenced;
 };
 
 #define for_each_label_withdel(l0, l) \
@@ -200,8 +204,11 @@ struct property *reverse_properties(struct property *first);
 struct node *build_node(struct property *proplist, struct node *children);
 struct node *build_node_delete(void);
 struct node *name_node(struct node *node, char *name);
+struct node *omit_node_if_unused(struct node *node);
+struct node *reference_node(struct node *node);
 struct node *chain_node(struct node *first, struct node *list);
 struct node *merge_nodes(struct node *old_node, struct node *new_node);
+struct node *add_orphan_node(struct node *old_node, struct node *new_node, char *ref);
 
 void add_property(struct node *node, struct property *prop);
 void delete_property_by_name(struct node *node, char *name);
@@ -215,6 +222,7 @@ void append_to_property(struct node *node,
 const char *get_unitname(struct node *node);
 struct property *get_property(struct node *node, const char *propname);
 cell_t propval_cell(struct property *prop);
+cell_t propval_cell_n(struct property *prop, int n);
 struct property *get_property_by_label(struct node *tree, const char *label,
 				       struct node **node);
 struct marker *get_marker_label(struct node *tree, const char *label,
@@ -286,4 +294,4 @@ struct dt_info *dt_from_source(const char *f);
 
 struct dt_info *dt_from_fs(const char *dirname);
 
-#endif /* _DTC_H */
+#endif /* DTC_H */

scripts/dtc/dtc-parser.y

@@ -731,7 +731,7 @@ static char *nodename_from_path(const char *ppath, const char *cpath)
 
 	plen = strlen(ppath);
 
-	if (!strneq(ppath, cpath, plen))
+	if (!strstarts(cpath, ppath))
 		die("Path \"%s\" is not valid as a child of \"%s\"\n",
 		    cpath, ppath);
 

scripts/dtc/dtc.c

@@ -88,7 +88,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
 		    || ((offset + len) > fdt_size_dt_struct(fdt)))
 			return NULL;
 
-	return _fdt_offset_ptr(fdt, offset);
+	return fdt_offset_ptr_(fdt, offset);
 }
 
 uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
@@ -123,6 +123,9 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
 		/* skip-name offset, length and value */
 		offset += sizeof(struct fdt_property) - FDT_TAGSIZE
 			+ fdt32_to_cpu(*lenp);
+		if (fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 &&
+		    ((offset - fdt32_to_cpu(*lenp)) % 8) != 0)
+			offset += 4;
 		break;
 
 	case FDT_END:
@@ -141,7 +144,7 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
 	return tag;
 }
 
-int _fdt_check_node_offset(const void *fdt, int offset)
+int fdt_check_node_offset_(const void *fdt, int offset)
 {
 	if ((offset < 0) || (offset % FDT_TAGSIZE)
 	    || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))
@@ -150,7 +153,7 @@ int _fdt_check_node_offset(const void *fdt, int offset)
 	return offset;
 }
 
-int _fdt_check_prop_offset(const void *fdt, int offset)
+int fdt_check_prop_offset_(const void *fdt, int offset)
 {
 	if ((offset < 0) || (offset % FDT_TAGSIZE)
 	    || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))
@@ -165,7 +168,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth)
 	uint32_t tag;
 
 	if (offset >= 0)
-		if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0)
+		if ((nextoffset = fdt_check_node_offset_(fdt, offset)) < 0)
 			return nextoffset;
 
 	do {
@@ -227,7 +230,7 @@ int fdt_next_subnode(const void *fdt, int offset)
 	return offset;
 }
 
-const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
+const char *fdt_find_string_(const char *strtab, int tabsize, const char *s)
 {
 	int len = strlen(s) + 1;
 	const char *last = strtab + tabsize - len;