From: Nick Spence <nick.spence@freescale.com>
Date: Fri, 9 May 2008 05:32:22 +0000 (-0700)
Subject: Support legacy multi-type images without FDT section.
X-Git-Tag: v1.3.3~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91a616741fc128cdb88f39bddcd4d72fe17466d0;p=u-boot

Support legacy multi-type images without FDT section.

This patch enables legacy multi-type images containing only a Linux kernel
and root file system to be loaded, maintaining compatibility with previous
versions of u-boot.

This is required when using old image files such as a Linux 2.4 kernel /
filesystem.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
Acked-by: Bartlomiej Sieka <tur@semihalf.com>
---

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 0328baddca..9194fd8b0a 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -667,9 +667,8 @@ static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 				goto error;
 			}
 		} else {
-			fdt_error ("Did not find a Flattened Device Tree "
-				"in a legacy multi-component image");
-			goto error;
+			debug ("## No Flattened Device Tree\n");
+			return 0;
 		}
 	} else {
 		debug ("## No Flattened Device Tree\n");