bzip2/lzma: comprehensible error messages for missing decompressor

Instead of failing to identify a compressed image with a decompressor
that we don't have compiled in, identify it and fail with a
comprehensible panic message.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/decompress.c b/lib/decompress.c
index edac55cc7823..961f367320fc 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -13,21 +13,25 @@
 #include <linux/types.h>
 #include <linux/string.h>
 
+#ifndef CONFIG_DECOMPRESS_GZIP
+# define gunzip NULL
+#endif
+#ifndef CONFIG_DECOMPRESS_BZIP2
+# define bunzip2 NULL
+#endif
+#ifndef CONFIG_DECOMPRESS_LZMA
+# define unlzma NULL
+#endif
+
 static const struct compress_format {
         unsigned char magic[2];
         const char *name;
         decompress_fn decompressor;
 } compressed_formats[] = {
-#ifdef CONFIG_DECOMPRESS_GZIP
         { {037, 0213}, "gzip", gunzip },
         { {037, 0236}, "gzip", gunzip },
-#endif
-#ifdef CONFIG_DECOMPRESS_BZIP2
         { {0x42, 0x5a}, "bzip2", bunzip2 },
-#endif
-#ifdef CONFIG_DECOMPRESS_LZMA
         { {0x5d, 0x00}, "lzma", unlzma },
-#endif
         { {0, 0}, NULL, NULL }
 };