minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmd_bootm.c: Do not load a ramdisk when not booting a kernel.

Browse Source 
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>
This commit is contained in:
Detlev Zundel 2009-12-22 12:43:01 +01:00 committed by Wolfgang Denk
parent 16035bcd8c
commit 8b828a8f44
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/cmd_bootm.c
View File

@ -293,7 +293,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1; return 1;
} }
if (images.os.os == IH_OS_LINUX) { if ((images.os.type == IH_TYPE_KERNEL) &&
(images.os.os == IH_OS_LINUX)) {
/* find ramdisk */ /* find ramdisk */
ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH, ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH,
&images.rd_start, &images.rd_end); &images.rd_start, &images.rd_end);