From: Simon Glass <sjg@chromium.org>
Date: Wed, 28 Mar 2012 10:08:25 +0000 (+0000)
Subject: arm: Check for valid FDT after console is up
X-Git-Tag: v2012.04-rc1~19^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2866903b3e32909085ffe486baca1bcb44e2caeb;p=kernel%2Fu-boot.git

arm: Check for valid FDT after console is up

When using CONFIG_OF_CONTROL, add a check that we have a valid FDT
and panic() if not. This must be done after the console is ready.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index b9b35de..5270c11 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -293,6 +293,14 @@ void board_init_f(ulong bootflag)
 		}
 	}
 
+#ifdef CONFIG_OF_CONTROL
+	/* For now, put this check after the console is ready */
+	if (fdtdec_prepare_fdt()) {
+		panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
+			"doc/README.fdt-control");
+	}
+#endif
+
 	debug("monitor len: %08lX\n", gd->mon_len);
 	/*
 	 * Ram is setup, size stored in gd !!