From ee7c0e712a22aff6c7db10acd040b215822f6622 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Wed, 17 May 2017 03:25:43 -0600 Subject: [PATCH] Convert CONFIG_CMD_LZMADEC to Kconfig 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 beec00a112..84da4e738c 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 dc81913767..5ee52f62cc 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 b3e2c47dcd..c62b45e51c 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 5b163a5499..1055caf19a 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 -- 2.39.5