SPDX: Correct SPDX tags from recent xilinx merge

[u-boot] / tools / fdtgrep.c

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index 67aa41a24de3a2da474331d64989ccba6109f8a4..f2b8b71ed743478be80cb91375a7670c7f6e38d9 100644 (file)
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -1,23 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013, Google Inc.
  * Written by Simon Glass <sjg@chromium.org>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Perform a grep of an FDT either displaying the source subset or producing
  * a new .dtb subset which can be used as required.
  */
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
 #include <getopt.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <../include/libfdt.h>
-#include <libfdt_internal.h>
+#include "fdt_host.h"
+#include "libfdt_internal.h"
 
 /* Define DEBUG to get some debugging output on stderr */
 #ifdef DEBUG
@@ -405,7 +407,7 @@ static int display_fdt_by_regions(struct display_info *disp, const void *blob,
  * The output of this function may or may not be a valid FDT. To ensure it
  * is, these disp->flags must be set:
  *
- *   FDT_REG_SUPERNODES: ensures that subnodes are preceeded by their
+ *   FDT_REG_SUPERNODES: ensures that subnodes are preceded by their
  *             parents. Without this option, fragments of subnode data may be
  *             output without the supernodes above them. This is useful for
  *             hashing but cannot produce a valid FDT.
@@ -522,18 +524,21 @@ static int check_type_include(void *priv, int type, const char *data, int size)
         * return 1 at the first match. For exclusive conditions, we must
         * check that there are no matches.
         */
-       for (val = disp->value_head; val; val = val->next) {
-               if (!(type & val->type))
-                       continue;
-               match = fdt_stringlist_contains(data, size, val->string);
-               debug("      - val->type=%x, str='%s', match=%d\n",
-                     val->type, val->string, match);
-               if (match && val->include) {
-                       debug("   - match inc %s\n", val->string);
-                       return 1;
+       if (data) {
+               for (val = disp->value_head; val; val = val->next) {
+                       if (!(type & val->type))
+                               continue;
+                       match = fdt_stringlist_contains(data, size,
+                                                       val->string);
+                       debug("      - val->type=%x, str='%s', match=%d\n",
+                             val->type, val->string, match);
+                       if (match && val->include) {
+                               debug("   - match inc %s\n", val->string);
+                               return 1;
+                       }
+                       if (match)
+                               none_match &= ~val->type;
                }
-               if (match)
-                       none_match &= ~val->type;
        }
 
        /*
@@ -660,6 +665,8 @@ static int fdtgrep_find_regions(const void *fdt,
                if (!ret)
                        count++;
        }
+       if (ret && ret != -FDT_ERR_NOTFOUND)
+               return ret;
 
        /* Find all the aliases and add those regions back in */
        if (disp->add_aliases && count < max_regions) {
@@ -667,7 +674,11 @@ static int fdtgrep_find_regions(const void *fdt,
 
                new_count = fdt_add_alias_regions(fdt, region, count,
                                                  max_regions, &state);
-               if (new_count <= max_regions) {
+               if (new_count == -FDT_ERR_NOTFOUND) {
+                       /* No alias node found */
+               } else if (new_count < 0) {
+                       return new_count;
+               } else if (new_count <= max_regions) {
                        /*
                        * The alias regions will now be at the end of the list.
                        * Sort the regions by offset to get things into the
@@ -679,9 +690,6 @@ static int fdtgrep_find_regions(const void *fdt,
                }
        }
 
-       if (ret != -FDT_ERR_NOTFOUND)
-               return ret;
-
        return count;
 }