summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2009-12-22 12:43:01 +0100
committerWolfgang Denk <wd@denx.de>2010-01-18 00:26:34 +0100
commit8b828a8f44b7ee9953c7ba63e64b1e80790139b3 (patch)
treec0c01d4a2fc409585308ebcac5ef8263b6ad1790
parent16035bcd8c81c3c59dddfb54f48e8059a623b13c (diff)
downloadu-boot-imx-8b828a8f44b7ee9953c7ba63e64b1e80790139b3.zip
u-boot-imx-8b828a8f44b7ee9953c7ba63e64b1e80790139b3.tar.gz
u-boot-imx-8b828a8f44b7ee9953c7ba63e64b1e80790139b3.tar.bz2
cmd_bootm.c: Do not load a ramdisk when not booting a kernel.
In case we boot an image marked as 'standalone' and 'linux', the current code erroneously tried to load a ramdisk. Signed-off-by: Detlev Zundel <dzu@denx.de>
-rw-r--r--common/cmd_bootm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0ef3e5e..dc993d5 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -293,7 +293,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1;
}
- if (images.os.os == IH_OS_LINUX) {
+ if ((images.os.type == IH_TYPE_KERNEL) &&
+ (images.os.os == IH_OS_LINUX)) {
/* find ramdisk */
ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH,
&images.rd_start, &images.rd_end);