[U-Boot] [PATCH 47/47] Convert CONFIG_CMD_LZMADEC to Kconfig

Simon Glass
2017-05-15T10:58:02Z

This converts the following to Kconfig:
CONFIG_CMD_LZMADEC

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

arch/Kconfig | 1 +
cmd/Kconfig | 11 +++++++++++
cmd/Makefile | 2 --
include/configs/sandbox.h | 2 --
scripts/config_whitelist.txt | 1 -
5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index a0324bbe76..9c1ef79126 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -72,6 +72,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 a760e9b05e..c3e8627803 100644
--- 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 1293d24e39..9ea56e9977 100644
--- 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 5a04ce98e7..1a7e5a3210 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -154,8 +154,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 db2f7ffc6e..93b29ed63d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -384,7 +384,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
--
2.13.0.rc2.291.g57267f2277-goog