diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 09:25:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 16:45:33 (GMT) |
| commit | ee7c0e712a22aff6c7db10acd040b215822f6622 (patch) | |
| tree | cb5787098d7ba8c36f76fde5b174eac001d878b2 | |
| parent | aed998aa34b22e818b2cd58ca7f2246716f2c3a6 (diff) | |
| download | u-boot-fsl-qoriq-ee7c0e712a22aff6c7db10acd040b215822f6622.tar.xz | |
Convert CONFIG_CMD_LZMADEC to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_LZMADEC
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/Kconfig | 1 | ||||
| -rw-r--r-- | cmd/Kconfig | 11 | ||||
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 12 insertions, 5 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index beec00a..84da4e7 100644 --- 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 dc81913..5ee52f6 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 1293d24..9ea56e9 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 b3e2c47..c62b45e 100644 --- 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 5b163a5..1055caf 100644 --- 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 |