From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 6 May 2013 05:55:41 +0000 (+0200)
Subject: microblaze: Also check return value from fdt_initrd
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de349ee41bed13c1e4894df936254012e39337a2;p=thirdparty%2Fu-boot.git

microblaze: Also check return value from fdt_initrd

If DTS is broken do not start the kernel.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index fbb43b88aae..1f85c8b89db 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -71,7 +71,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
 
 	/* fixup the initrd now that we know where it should be */
 	if (images->rd_start && images->rd_end && of_flat_tree)
-		fdt_initrd(of_flat_tree, images->rd_start, images->rd_end, 1);
+		ret = fdt_initrd(of_flat_tree, images->rd_start,
+				 images->rd_end, 1);
+		if (ret)
+			return 1;
 
 #ifdef DEBUG
 	printf("## Transferring control to Linux (at address 0x%08lx) ",