dtc: import latest upstream dtc

[mirror_ubuntu-artful-kernel.git] / scripts / dtc / dtc.c

diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index 2ef5e2e3dd38f781ef92fdd1d702e30c96fd7b20..a375683c1534f2a1a3791ab34d75f8c15450f58b 100644 (file)
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -82,6 +82,8 @@ static void  __attribute__ ((noreturn)) usage(void)
        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");
@@ -91,6 +93,9 @@ static void  __attribute__ ((noreturn)) usage(void)
        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);
 }
 
@@ -113,7 +118,7 @@ int main(int argc, char *argv[])
        minsize    = 0;
        padsize    = 0;
 
-       while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fcqb:vH:s"))
+       while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fqb:i:vH:sW:E:"))
                        != EOF) {
                switch (opt) {
                case 'I':
@@ -149,6 +154,9 @@ int main(int argc, char *argv[])
                case 'b':
                        cmdline_boot_cpuid = strtoll(optarg, NULL, 0);
                        break;
+               case 'i':
+                       srcfile_add_search_path(optarg);
+                       break;
                case 'v':
                        printf("Version: %s\n", DTC_VERSION);
                        exit(0);
@@ -168,6 +176,14 @@ int main(int argc, char *argv[])
                        sort = 1;
                        break;
 
+               case 'W':
+                       parse_checks_option(true, false, optarg);
+                       break;
+
+               case 'E':
+                       parse_checks_option(false, true, optarg);
+                       break;
+
                case 'h':
                default:
                        usage();
@@ -188,9 +204,6 @@ int main(int argc, char *argv[])
        if (minsize)
                fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n");
 
-       fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
-               inform, outform, arg);
-
        if (depname) {
                depfile = fopen(depname, "w");
                if (!depfile)