Ver código fonte

Convert CONFIG_CMD_LZMADEC to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_LZMADEC

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 8 anos atrás
pai
commit
ee7c0e712a
5 arquivos alterados com 12 adições e 5 exclusões
  1. 1 0
      arch/Kconfig
  2. 11 0
      cmd/Kconfig
  3. 0 2
      cmd/Makefile
  4. 0 2
      include/configs/sandbox.h
  5. 0 1
      scripts/config_whitelist.txt

+ 1 - 0
arch/Kconfig

@@ -73,6 +73,7 @@ config SANDBOX
 	imply CMD_IO
 	imply CMD_IOTRACE
 	imply LZMA
+	imply CMD_LZMADEC
 
 config SH
 	bool "SuperH architecture"

+ 11 - 0
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

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 1
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