scripts/dtc: Update to upstream version v1.4.0

Update to the latest version of dtc with the following notable
enhancements and bug fixes:

* fdtput: expand fdt if value does not fit
* dtc/fdt{get, put}/convert-dtsv0-lexer: convert to new usage helpers
* libfdt: Add fdt_next_subnode() to permit easy subnode iteration
* utilfdt_read: pass back up the length of data read
* util_version: new helper for displaying version info
* die: constify format string arg
* utilfdt_read_err: use xmalloc funcs
* Export fdt_stringlist_contains()
* dtc: Drop the '-S is deprecated' warning
* dtc/libfdt: sparse fixes
* dtc/libfdt: introduce fdt types for annotation by endian checkers
* Fix util_is_printable_string
* dtc: srcpos_verror() should print to stderr
* libfdt: Added missing functions to shared library

Shipped bison/flex generated files were built on an Ubuntu 13.10 system.

Signed-off-by: Grant Likely <grant.likely@linaro.org>

6 files changed, 294 insertions, 82 deletions

diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index a375683c1534..e3c96536fd9d 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -21,8 +21,6 @@
 #include "dtc.h"
 #include "srcpos.h"
 
-#include "version_gen.h"
-
 /*
  * Command line options
  */
@@ -49,55 +47,60 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
                 fill_fullpaths(child, tree->fullpath);
 }
 
-static void  __attribute__ ((noreturn)) usage(void)
-{
-        fprintf(stderr, "Usage:\n");
-        fprintf(stderr, "\tdtc [options] <input file>\n");
-        fprintf(stderr, "\nOptions:\n");
-        fprintf(stderr, "\t-h\n");
-        fprintf(stderr, "\t\tThis help text\n");
-        fprintf(stderr, "\t-q\n");
-        fprintf(stderr, "\t\tQuiet: -q suppress warnings, -qq errors, -qqq all\n");
-        fprintf(stderr, "\t-I <input format>\n");
-        fprintf(stderr, "\t\tInput formats are:\n");
-        fprintf(stderr, "\t\t\tdts - device tree source text\n");
-        fprintf(stderr, "\t\t\tdtb - device tree blob\n");
-        fprintf(stderr, "\t\t\tfs - /proc/device-tree style directory\n");
-        fprintf(stderr, "\t-o <output file>\n");
-        fprintf(stderr, "\t-O <output format>\n");
-        fprintf(stderr, "\t\tOutput formats are:\n");
-        fprintf(stderr, "\t\t\tdts - device tree source text\n");
-        fprintf(stderr, "\t\t\tdtb - device tree blob\n");
-        fprintf(stderr, "\t\t\tasm - assembler source\n");
-        fprintf(stderr, "\t-V <output version>\n");
-        fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
-        fprintf(stderr, "\t-d <output dependency file>\n");
-        fprintf(stderr, "\t-R <number>\n");
-        fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
-        fprintf(stderr, "\t-S <bytes>\n");
-        fprintf(stderr, "\t\tMake the blob at least <bytes> long (extra space)\n");
-        fprintf(stderr, "\t-p <bytes>\n");
-        fprintf(stderr, "\t\tAdd padding to the blob of <bytes> long (extra space)\n");
-        fprintf(stderr, "\t-b <number>\n");
-        fprintf(stderr, "\t\tSet the physical boot cpu\n");
-        fprintf(stderr, "\t-f\n");
-        fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n");
-        fprintf(stderr, "\t-i\n");
-        fprintf(stderr, "\t\tAdd a path to search for include files\n");
-        fprintf(stderr, "\t-s\n");
-        fprintf(stderr, "\t\tSort nodes and properties before outputting (only useful for\n\t\tcomparing trees)\n");
-        fprintf(stderr, "\t-v\n");
-        fprintf(stderr, "\t\tPrint DTC version and exit\n");
-        fprintf(stderr, "\t-H <phandle format>\n");
-        fprintf(stderr, "\t\tphandle formats are:\n");
-        fprintf(stderr, "\t\t\tlegacy - \"linux,phandle\" properties only\n");
-        fprintf(stderr, "\t\t\tepapr - \"phandle\" properties only\n");
-        fprintf(stderr, "\t\t\tboth - Both \"linux,phandle\" and \"phandle\" properties\n");
-        fprintf(stderr, "\t-W [no-]<checkname>\n");
-        fprintf(stderr, "\t-E [no-]<checkname>\n");
-        fprintf(stderr, "\t\t\tenable or disable warnings and errors\n");
-        exit(3);
-}
+/* Usage related data. */
+static const char usage_synopsis[] = "dtc [options] <input file>";
+static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:hv";
+static struct option const usage_long_opts[] = {
+        {"quiet",            no_argument, NULL, 'q'},
+        {"in-format",         a_argument, NULL, 'I'},
+        {"out",               a_argument, NULL, 'o'},
+        {"out-format",        a_argument, NULL, 'O'},
+        {"out-version",       a_argument, NULL, 'V'},
+        {"out-dependency",    a_argument, NULL, 'd'},
+        {"reserve",           a_argument, NULL, 'R'},
+        {"space",             a_argument, NULL, 'S'},
+        {"pad",               a_argument, NULL, 'p'},
+        {"boot-cpu",          a_argument, NULL, 'b'},
+        {"force",            no_argument, NULL, 'f'},
+        {"include",           a_argument, NULL, 'i'},
+        {"sort",             no_argument, NULL, 's'},
+        {"phandle",           a_argument, NULL, 'H'},
+        {"warning",           a_argument, NULL, 'W'},
+        {"error",             a_argument, NULL, 'E'},
+        {"help",             no_argument, NULL, 'h'},
+        {"version",          no_argument, NULL, 'v'},
+        {NULL,               no_argument, NULL, 0x0},
+};
+static const char * const usage_opts_help[] = {
+        "\n\tQuiet: -q suppress warnings, -qq errors, -qqq all",
+        "\n\tInput formats are:\n"
+         "\t\tdts - device tree source text\n"
+         "\t\tdtb - device tree blob\n"
+         "\t\tfs  - /proc/device-tree style directory",
+        "\n\tOutput file",
+        "\n\tOutput formats are:\n"
+         "\t\tdts - device tree source text\n"
+         "\t\tdtb - device tree blob\n"
+         "\t\tasm - assembler source",
+        "\n\tBlob version to produce, defaults to %d (for dtb and asm output)", //, DEFAULT_FDT_VERSION);
+        "\n\tOutput dependency file",
+        "\n\ttMake space for <number> reserve map entries (for dtb and asm output)",
+        "\n\tMake the blob at least <bytes> long (extra space)",
+        "\n\tAdd padding to the blob of <bytes> long (extra space)",
+        "\n\tSet the physical boot cpu",
+        "\n\tTry to produce output even if the input tree has errors",
+        "\n\tAdd a path to search for include files",
+        "\n\tSort nodes and properties before outputting (useful for comparing trees)",
+        "\n\tValid phandle formats are:\n"
+         "\t\tlegacy - \"linux,phandle\" properties only\n"
+         "\t\tepapr  - \"phandle\" properties only\n"
+         "\t\tboth   - Both \"linux,phandle\" and \"phandle\" properties",
+        "\n\tEnable/disable warnings (prefix with \"no-\")",
+        "\n\tEnable/disable errors (prefix with \"no-\")",
+        "\n\tPrint this help and exit",
+        "\n\tPrint version and exit",
+        NULL,
+};
 
 int main(int argc, char *argv[])
 {
@@ -118,8 +121,7 @@ int main(int argc, char *argv[])
         minsize    = 0;
         padsize    = 0;
 
-        while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fqb:i:vH:sW:E:"))
-                        != EOF) {
+        while ((opt = util_getopt_long()) != EOF) {
                 switch (opt) {
                 case 'I':
                         inform = optarg;
@@ -158,8 +160,7 @@ int main(int argc, char *argv[])
                         srcfile_add_search_path(optarg);
                         break;
                 case 'v':
-                        printf("Version: %s\n", DTC_VERSION);
-                        exit(0);
+                        util_version();
                 case 'H':
                         if (streq(optarg, "legacy"))
                                 phandle_format = PHANDLE_LEGACY;
@@ -185,13 +186,14 @@ int main(int argc, char *argv[])
                         break;
 
                 case 'h':
+                        usage(NULL);
                 default:
-                        usage();
+                        usage("unknown option");
                 }
         }
 
         if (argc > (optind+1))
-                usage();
+                usage("missing files");
         else if (argc < (optind+1))
                 arg = "-";
         else
@@ -201,9 +203,6 @@ int main(int argc, char *argv[])
         if (minsize && padsize)
                 die("Can't set both -p and -S\n");
 
-        if (minsize)
-                fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n");
-
         if (depname) {
                 depfile = fopen(depname, "w");
                 if (!depfile)
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index 3e42a071070e..264a20cf66a8 100644
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -66,7 +66,6 @@ typedef uint32_t cell_t;
 #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
 
 #define ALIGN(x, a)     (((x) + (a) - 1) & ~((a) - 1))
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 /* Data blobs */
 enum markertype {
diff --git a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c
index 246ab4bc0d9d..c20bc5315bc1 100644
--- a/scripts/dtc/srcpos.c
+++ b/scripts/dtc/srcpos.c
@@ -297,9 +297,9 @@ srcpos_verror(struct srcpos *pos, char const *fmt, va_list va)
 
        srcstr = srcpos_string(pos);
 
-       fprintf(stdout, "Error: %s ", srcstr);
+       fprintf(stderr, "Error: %s ", srcstr);