From: Tom Rini <trini@ti.com>
Date: Wed, 3 Dec 2014 18:19:34 +0000 (-0500)
Subject: Revert "image-fdt: boot_get_fdt() return value when no DTB exists"
X-Git-Tag: v2015.01-rc3~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0c6e1c31b94f193047619b6adf67c2d792b659e;p=oweals%2Fu-boot.git

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 1d76bd60da..8db3ccb4e7 100644
--- 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;