cmd: zip: automatically pull in gzip()

Move the CONFIG_GZIP_COMPRESSED from a config.h macro to a Kconfig menu
item. It is not selectable by a user because there is no reason to do
so. Instead it will be automatically selected by the stuff which uses
gzip(), like the zip command.

Remove it from the config_whitelist.txt. Also remove
CONFIG_GZIP_COMPRESS_DEF_SZ as this was never used on any board. The
default seems to be sane, otherwise it should be added as a Kconfig
option.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index f4eb575b6e6f0e5a10f1fcd21f9bfe3e4b54ed3f..153864c58768246dcf17a20db0698587cf7db1b1 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -816,6 +816,7 @@ config CMD_UNZIP
 
 config CMD_ZIP
        bool "zip"
+       select GZIP_COMPRESSED
        help
          Compress a memory region with zlib deflate method.
 

diff --git a/lib/Kconfig b/lib/Kconfig
index c3f694afc063eb56e1d0db65b9425527130fd602..f18bf3778b9eae882b1703fff0912177663efb92 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -424,6 +424,10 @@ config GZIP
        help
          This enables support for GZIP compression algorithm.
 
+config GZIP_COMPRESSED
+       bool
+       select ZLIB
+
 config BZIP2
        bool "Enable bzip2 decompression support"
        help

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5566de96068e2d145de924d9fdfa609f828e5127..61d025f053b2ecd64a4cb59c9345fef8aa380ae5 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -643,8 +643,6 @@ CONFIG_GPIO_LED_STUBS
 CONFIG_GREEN_LED
 CONFIG_GURNARD_FPGA
 CONFIG_GURNARD_SPLASH
-CONFIG_GZIP_COMPRESSED
-CONFIG_GZIP_COMPRESS_DEF_SZ
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM