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 <[email protected]> --- common/cmd_bootm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 94ddac3..26cae97 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -297,7 +297,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); -- 1.6.2.5 _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
