[U-Boot,RFC,23/44] fdt: Skip checking FDT if the pointer is NULL

Submitted by Simon Glass on Jan. 5, 2013, 1:51 a.m.

Details

Message ID 1357350734-13737-24-git-send-email-sjg@chromium.org
State Superseded, archived
Headers show

Commit Message

Simon Glass Jan. 5, 2013, 1:51 a.m.
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>
---
 lib/fdtdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 6dba438..740bd56 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -318,7 +318,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\n");