summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-28 15:56:31 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-11-29 21:12:42 +0100
commit32daa5509a68f58fe365fadafdb5b1ec5d72fff5 (patch)
tree03fbdbc7c9b14d8652ee1c65d433f9717812697d /commands/bootm.c
parent1aac831cca66d7ac70e369a09c944c0a54547d32 (diff)
downloadbarebox-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/bootm.c')
-rw-r--r--commands/bootm.c4
1 files changed, 2 insertions, 2 deletions
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 ... ");