Revert "image-fdt: boot_get_fdt() return value when no DTB exists"

It has been found that this change breaks the case of an appended device
tree file, so for the problem in question some other solution must be
found.

This reverts commit c6150aaf2f2745141a7c2ceded58d7efbfeace7d.

Reported-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
Reported-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Confirmed-by: Bill Pringlemeir <bpringlemeir@nbsps.com>
Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 1d76bd60da843404d9dda64e4c5a93630e7ecb5e..8db3ccb4e7404b5b1f4f0bfca22998414157e0bc 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -413,11 +413,11 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
                        }
                } else {
                        debug("## No Flattened Device Tree\n");
-                       goto error;
+                       return 0;
                }
        } else {
                debug("## No Flattened Device Tree\n");
-               goto error;
+               return 0;
        }
 
        *of_flat_tree = fdt_blob;