From: Simon Glass <sjg@chromium.org>
Date: Sat, 20 Apr 2013 08:42:46 +0000 (+0000)
Subject: fdt: Skip checking FDT if the pointer is NULL
X-Git-Tag: v2013.07-rc1~18^2~38
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c309c2da147c2f166132341d578a41d3d9132966;p=u-boot

fdt: Skip checking FDT if the pointer is NULL

If we have no FDT, don't attempt to read from it. This allows sandbox to
run without an FDT if required.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 60369fbc57..ac1fe0be20 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -354,7 +354,8 @@ int fdtdec_check_fdt(void)
  */
 int fdtdec_prepare_fdt(void)
 {
-	if (((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) {
+	if (!gd->fdt_blob || ((uintptr_t)gd->fdt_blob & 3) ||
+	    fdt_check_header(gd->fdt_blob)) {
 		printf("No valid FDT found - please append one to U-Boot "
 			"binary, use u-boot-dtb.bin or define "
 			"CONFIG_OF_EMBED. For sandbox, use -d <file.dtb>\n");