From: Detlev Zundel <dzu@denx.de>
Date: Tue, 22 Dec 2009 11:43:01 +0000 (+0100)
Subject: cmd_bootm.c: Do not load a ramdisk when not booting a kernel.
X-Git-Tag: v2010.03-rc1~143
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=8b828a8f44b7ee9953c7ba63e64b1e80790139b3

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>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0ef3e5ebc6..dc993d5408 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);