All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew McClintock <msm@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/3] common/cmd_ximg.c: add ifdef protection for gzip uncompression
Date: Mon, 23 May 2011 13:29:13 -0500	[thread overview]
Message-ID: <1306175353-2983-3-git-send-email-msm@freescale.com> (raw)
In-Reply-To: <1306175353-2983-2-git-send-email-msm@freescale.com>

Print a message if we do not have the ability to uncompress a gzip
image. Before, u-boot would just assume the routines were available

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 common/cmd_ximg.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index dceb975..2ec7ba4 100644
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -216,12 +216,18 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 #endif	/* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
 			break;
 		case IH_COMP_GZIP:
+#ifdef CONFIG_GZIP
 			printf ("   Uncompressing part %d ... ", part);
 			if (gunzip ((void *) dest, unc_len,
 				    (uchar *) data, &len) != 0) {
 				puts ("GUNZIP ERROR - image not loaded\n");
 				return 1;
 			}
+#else
+			printf("    gzip decompression not supported in this"
+				" build!\n");
+			return 1;
+#endif
 			break;
 #if defined(CONFIG_BZIP2)
 		case IH_COMP_BZIP2:
-- 
1.7.3.4

  reply	other threads:[~2011-05-23 18:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-23 18:29 [U-Boot] [PATCH 1/3] disk/part.c: Make features optional Matthew McClintock
2011-05-23 18:29 ` [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm Matthew McClintock
2011-05-23 18:29   ` Matthew McClintock [this message]
2011-05-24  3:10     ` [U-Boot] [PATCH 3/3] common/cmd_ximg.c: add ifdef protection for gzip uncompression Mike Frysinger
2011-05-24 15:48       ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-07-26 12:28         ` Wolfgang Denk
2011-05-24  3:12   ` [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm Mike Frysinger
2011-05-24 15:47     ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-06-01 15:10       ` Mike Frysinger
2011-06-01 15:55         ` McClintock Matthew-B29882
2011-06-01 16:59           ` Mike Frysinger
2011-06-01 17:58             ` McClintock Matthew-B29882
2011-06-01 17:56         ` Scott Wood
2011-06-01 19:21         ` Wolfgang Denk
2011-06-02 14:56           ` Mike Frysinger
2011-05-23 21:21 ` [U-Boot] [PATCH 1/3] disk/part.c: Make features optional Kumar Gala
2011-05-23 21:49   ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-05-24  3:08     ` Mike Frysinger
2011-05-24 15:31       ` [U-Boot] [PATCH v3 " Matthew McClintock

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=1306175353-2983-3-git-send-email-msm@freescale.com \
    --to=msm@freescale.com \
    --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 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.