summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Spence <nick.spence@freescale.com>2008-05-08 22:32:22 -0700
committerWolfgang Denk <wd@denx.de>2008-05-10 00:38:55 +0200
commit91a616741fc128cdb88f39bddcd4d72fe17466d0 (patch)
tree269bc7109d55b8f460eea775264607ad0cefeefa
parent881031d9732783b7aeae2198fc7eb480ae8974a6 (diff)
downloadu-boot-imx-91a616741fc128cdb88f39bddcd4d72fe17466d0.zip
u-boot-imx-91a616741fc128cdb88f39bddcd4d72fe17466d0.tar.gz
u-boot-imx-91a616741fc128cdb88f39bddcd4d72fe17466d0.tar.bz2
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>
-rw-r--r--lib_ppc/bootm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 0328bad..9194fd8 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");