* [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"
[not found] ` <4BB069D4.7070303@denx.de>
@ 2010-03-29 11:15 ` Heiko Schocher
2010-03-29 12:32 ` Wolfgang Denk
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Schocher @ 2010-03-29 11:15 UTC (permalink / raw)
To: u-boot
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>
---
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 23ab0c4..995e378 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,
--
1.6.2.5
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"
2010-03-29 11:15 ` [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt" Heiko Schocher
@ 2010-03-29 12:32 ` Wolfgang Denk
0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Denk @ 2010-03-29 12:32 UTC (permalink / raw)
To: u-boot
Dear Heiko Schocher,
In message <4BB08BE4.801@denx.de> you wrote:
> 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>
> ---
> common/cmd_bootm.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A witty saying proves nothing, but saying something pointless gets
people's attention.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-29 12:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <DC2C564DA65CFA4AACC2C8CBF9129CCC05BFC0D44F@EXMBX1.kiebackpeter.kup>
[not found] ` <20100324111428.511104C022@gemini.denx.de>
[not found] ` <BF7E414B7C8F49478FF713EBA44861720283B9444B@EXMBX1.kiebackpeter.kup>
[not found] ` <4BAB7127.6070807@denx.de>
[not found] ` <DC2C564DA65CFA4AACC2C8CBF9129CCC05D622947D@EXMBX1.kiebackpeter.kup>
[not found] ` <4BAC7337.4070103@denx.de>
[not found] ` <20100326104859.566A7E8E722@gemini.denx.de>
[not found] ` <DC2C564DA65CFA4AACC2C8CBF9129CCC05F50FB5B5@EXMBX1.kiebackpeter.kup>
[not found] ` <4BB069D4.7070303@denx.de>
2010-03-29 11:15 ` [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt" Heiko Schocher
2010-03-29 12:32 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.