[PATCH 09/16] bootm: do not select uncompression methods

[Sascha Hauer]

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

Signed-off-by: Sascha Hauer <s.hauer at 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