diff options
| author | Heiko Schocher <hs@denx.de> | 2010-03-29 13:15:48 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-03-29 14:31:42 +0200 |
| commit | 24de2f4be00f81c58270d0df47296bf3a3601cef (patch) | |
| tree | 0b1a77a213b63a4f042b60e5aa47c3c5baecd0dc /common | |
| parent | 2883cc2d48e99fd1873ef8af03fee7966611b735 (diff) | |
| download | blackbird-obmc-uboot-24de2f4be00f81c58270d0df47296bf3a3601cef.tar.gz blackbird-obmc-uboot-24de2f4be00f81c58270d0df47296bf3a3601cef.zip | |
bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"
Booting a "Multi-File Image" including a linux kernel, ramdisk and
fdt, generated with
mkimage -A ppc \
-O linux \
-T multi \
-C gzip \
-a 00000000 \
-e 00000000 \
-n "kernel-2.6+initrd+dtb" \
-d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \
multi.bin
actually fails, because ramdisk start and end addresses
didn;t get initialized. This patch fixes this issue.
Tested on the KUP4K board.
Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | 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 23ab0c4aae..995e378359 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -291,7 +291,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } - if ((images.os.type == IH_TYPE_KERNEL) && + if (((images.os.type == IH_TYPE_KERNEL) || + (images.os.type == IH_TYPE_MULTI)) && (images.os.os == IH_OS_LINUX)) { /* find ramdisk */ ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH, |
