public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"
Date: Mon, 29 Mar 2010 13:15:48 +0200	[thread overview]
Message-ID: <4BB08BE4.801@denx.de> (raw)
In-Reply-To: <4BB069D4.7070303@denx.de>

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

       reply	other threads:[~2010-03-29 11:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [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                 ` Heiko Schocher [this message]
2010-03-29 12:32                   ` [U-Boot] bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt" Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BB08BE4.801@denx.de \
    --to=hs@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox