diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-28 15:56:31 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 21:12:42 +0100 |
commit | 32daa5509a68f58fe365fadafdb5b1ec5d72fff5 (patch) | |
tree | 03fbdbc7c9b14d8652ee1c65d433f9717812697d /commands | |
parent | 1aac831cca66d7ac70e369a09c944c0a54547d32 (diff) | |
download | barebox-32daa5509a68f58fe365fadafdb5b1ec5d72fff5.tar.gz barebox-32daa5509a68f58fe365fadafdb5b1ec5d72fff5.tar.xz |
bootm: do not select uncompression methods
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>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/Kconfig | 12 | ||||
-rw-r--r-- | commands/bootm.c | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 93f14b278e..6b21a2ea7d 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 e2ed9bec50..01ad4c7da6 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -85,7 +85,7 @@ int relocate_image(struct image_handle *handle, void *load_address) memmove(load_address, data, len); } break; -#ifdef CONFIG_CMD_BOOTM_ZLIB +#ifdef CONFIG_ZLIB case IH_COMP_GZIP: printf (" Uncompressing ... "); @@ -95,7 +95,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 ... "); |