Convert CONFIG_CMD_LZMADEC to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_LZMADEC

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index beec00a11269e2d5ef736c5d482ebad8e338a395..84da4e738cc5db1b381b99555092234febbf865b 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -73,6 +73,7 @@ config SANDBOX
        imply CMD_IO
        imply CMD_IOTRACE
        imply LZMA
+       imply CMD_LZMADEC
 
 config SH
        bool "SuperH architecture"

diff --git a/cmd/Kconfig b/cmd/Kconfig
index dc81913767cc817b73cb4d55bd71a8817461fc2d..5ee52f62cc140a4419bed705c8c46e08dfe387d4 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -438,6 +438,17 @@ config CMD_MEMINFO
        help
          Display memory information.
 
+endmenu
+
+menu "Compression commands"
+
+config CMD_LZMADEC
+       bool "lzmadec"
+       select LZMA
+       help
+         Support decompressing an LZMA (Lempel-Ziv-Markov chain algorithm)
+         image from memory.
+
 config CMD_UNZIP
        bool "unzip"
        help

diff --git a/cmd/Makefile b/cmd/Makefile
index 1293d24e394d5efaeb78f858ee6a345abca80cb6..9ea56e99778a04ccb0eefe1ad96313b60b0231d4 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -127,9 +127,7 @@ obj-$(CONFIG_CMD_UBI) += ubi.o
 obj-$(CONFIG_CMD_UBIFS) += ubifs.o
 obj-$(CONFIG_CMD_UNIVERSE) += universe.o
 obj-$(CONFIG_CMD_UNZIP) += unzip.o
-ifdef CONFIG_LZMA
 obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o
-endif
 
 obj-$(CONFIG_CMD_USB) += usb.o disk.o
 obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index b3e2c47dcd2a0d119fa5c9f3b3c6af5d8c7fe0c0..c62b45e51cf1c10ee5c8c60b778e8b6d6fd82aad 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -150,8 +150,6 @@
 #define CONFIG_BZIP2
 #define CONFIG_LZO
 
-#define CONFIG_CMD_LZMADEC
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_IDE_MAXBUS          1
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5b163a5499da40dc129db751b7df48db967f83c3..1055caf19aa2d2a5c5870d33471e9357da81bee0 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_LZMADEC
 CONFIG_CMD_MAX6957
 CONFIG_CMD_MEM
 CONFIG_CMD_MFSL