mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 09/16] bootm: do not select uncompression methods
Date: Mon, 28 Nov 2011 23:10:02 +0100	[thread overview]
Message-ID: <1322518209-2965-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1322518209-2965-1-git-send-email-s.hauer@pengutronix.de>

Instead, let the user select them manually so that bootm supports
all compression types compiled in.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/Kconfig |   12 ------------
 commands/bootm.c |    4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/commands/Kconfig b/commands/Kconfig
index 18ab840..e5c0fb5 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -292,18 +292,6 @@ config CMD_BOOTM
 	select CRC32
 	prompt "bootm"
 
-config CMD_BOOTM_ZLIB
-	bool
-	depends on CMD_BOOTM
-	select ZLIB
-	prompt "bootm with zlib support"
-
-config CMD_BOOTM_BZLIB
-	bool
-	depends on CMD_BOOTM
-	select BZLIB
-	prompt "bootm with bzlib support"
-
 config CMD_BOOTM_SHOW_TYPE
 	bool
 	depends on CMD_BOOTM
diff --git a/commands/bootm.c b/commands/bootm.c
index 578e9a5..878b7aa 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -131,7 +131,7 @@ int relocate_image(struct image_handle *handle, void *load_address)
 			memmove ((void *) image_get_load(hdr), (uchar *)data, len);
 		}
 		break;
-#ifdef CONFIG_CMD_BOOTM_ZLIB
+#ifdef CONFIG_ZLIB
 	case IH_COMP_GZIP:
 		printf ("   Uncompressing ... ");
 
@@ -141,7 +141,7 @@ int relocate_image(struct image_handle *handle, void *load_address)
 			return ret;
 		break;
 #endif
-#ifdef CONFIG_CMD_BOOTM_BZLIB
+#ifdef CONFIG_BZLIB
 	case IH_COMP_BZIP2:
 		printf ("   Uncompressing ... ");
 
-- 
1.7.7.1


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

  parent reply	other threads:[~2011-11-28 22:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-28 22:09 uncompress work Sascha Hauer
2011-11-28 22:09 ` [PATCH 01/16] armlinux: remove unnecessary include Sascha Hauer
2011-11-28 22:09 ` [PATCH 02/16] arm bootm: " Sascha Hauer
2011-11-28 22:09 ` [PATCH 03/16] scripts/mkimage.c: " Sascha Hauer
2011-11-28 22:09 ` [PATCH 04/16] use kernel bunzip implementation Sascha Hauer
2011-11-28 22:09 ` [PATCH 05/16] remove old bzlib Sascha Hauer
2011-11-28 22:09 ` [PATCH 06/16] add kernel gunzip implementation Sascha Hauer
2011-11-28 22:10 ` [PATCH 07/16] remove old zlib Sascha Hauer
2011-12-03 18:47   ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 22:10 ` [PATCH 08/16] lib: prompt for uncompression functions Sascha Hauer
2011-11-28 22:10 ` Sascha Hauer [this message]
2011-11-28 22:10 ` [PATCH 10/16] add file detection support Sascha Hauer
2011-11-28 23:10   ` Marc Kleine-Budde
2011-11-29 19:41     ` Sascha Hauer
2011-11-29 19:40   ` Sascha Hauer
2011-11-28 22:10 ` [PATCH 11/16] lzo: export decompress_unlzo function Sascha Hauer
2011-11-28 22:10 ` [PATCH 12/16] Add generic uncompress function Sascha Hauer
2011-11-28 22:10 ` [PATCH 13/16] add generic uncompress command Sascha Hauer
2011-11-28 22:10 ` [PATCH 14/16] update configs and default envs for uncompress Sascha Hauer
2011-11-28 22:10 ` [PATCH 15/16] remove now unused unlzo function Sascha Hauer
2011-11-28 22:10 ` [PATCH 16/16] bootm: use generic uncompress function 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=1322518209-2965-10-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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