projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16035bc
)
cmd_bootm.c: Do not load a ramdisk when not booting a kernel.
author
Detlev Zundel
<dzu@denx.de>
Tue, 22 Dec 2009 11:43:01 +0000
(12:43 +0100)
committer
Wolfgang Denk
<wd@denx.de>
Sun, 17 Jan 2010 23:26:34 +0000
(
00:26
+0100)
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>
common/cmd_bootm.c
patch
|
blob
|
history
diff --git
a/common/cmd_bootm.c
b/common/cmd_bootm.c
index 0ef3e5ebc6347a3a32490554f09581943299d57e..dc993d540872c4043ac04540d4b5590e88e10043 100644
(file)
--- 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);