Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / tools / fdtgrep.c

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index caaf600..e373c43 100644 (file)
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -405,7 +405,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.
@@ -660,6 +660,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,33 +669,22 @@ 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) {
-                       region = malloc(new_count * sizeof(struct fdt_region));
-                       if (!region) {
-                               fprintf(stderr,
-                                       "Out of memory for %d regions\n",
-                                       count);
-                               return -1;
-                       }
-                       memcpy(region, state.region,
-                              count * sizeof(struct fdt_region));
-                       free(state.region);
-                       new_count = fdt_add_alias_regions(fdt, region, count,
-                                                         max_regions, &state);
+               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
+                       * right order
+                       */
+                       count = new_count;
+                       qsort(region, count, sizeof(struct fdt_region),
+                             h_cmp_region);
                }
-
-               /*
-                * The alias regions will now be at the end of the list. Sort
-                * the regions by offset to get things into the right order
-                */
-               qsort(region, new_count, sizeof(struct fdt_region),
-                     h_cmp_region);
-               count = new_count;
        }
 
-       if (ret != -FDT_ERR_NOTFOUND)
-               return ret;
-
        return count;
 }
 
@@ -805,7 +796,7 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
         * The first pass will count the regions, but if it is too many,
         * we do another pass to actually record them.
         */
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < 3; i++) {
                region = malloc(count * sizeof(struct fdt_region));
                if (!region) {
                        fprintf(stderr, "Out of memory for %d regions\n",