mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 4/4] uimage_laod: fix ramdisk support
Date: Mon, 13 Aug 2012 08:57:14 +0200	[thread overview]
Message-ID: <1344841034-10068-4-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1344841034-10068-1-git-send-email-plagnioj@jcrosoft.com>

ramdisk U-Boot expect to ignore the compression type

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/uimage.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/uimage.c b/common/uimage.c
index 735b64e..442a7f0 100644
--- a/common/uimage.c
+++ b/common/uimage.c
@@ -334,7 +334,8 @@ int uimage_load(struct uimage_handle *handle, unsigned int image_no,
 	if (ret < 0)
 		return ret;
 
-	if (hdr->ih_comp == IH_COMP_NONE)
+	/* if ramdisk U-Boot expect to ignore the compression type */
+	if (hdr->ih_comp == IH_COMP_NONE || hdr->ih_type == IH_TYPE_RAMDISK)
 		uncompress_fn = uncompress_copy;
 	else
 		uncompress_fn = uncompress;
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-08-13  6:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-13  6:54 [for master PATCH 0/4] Bootm uImage initrd fix Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57 ` [PATCH 1/4] arm/bootm: fix initrd_start init Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57   ` [PATCH 2/4] bootm: do not load the initrd in the common code Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57   ` [PATCH 3/4] uimage_sdram_flush: fix resource start Jean-Christophe PLAGNIOL-VILLARD
2012-08-13  6:57   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-08-13 18:38 ` [for master PATCH 0/4] Bootm uImage initrd fix Sascha Hauer

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=1344841034-10068-4-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /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