Browse Source

Convert CONFIG_LZMA to Kconfig

This converts the following to Kconfig:
   CONFIG_LZMA

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 7 years ago
parent
commit
aed998aa34

+ 0 - 23
README

@@ -1723,29 +1723,6 @@ The following options need to be configured:
 		the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should
 		be at least 4MB.
 
-		CONFIG_LZMA
-
-		If this option is set, support for lzma compressed
-		images is included.
-
-		Note: The LZMA algorithm adds between 2 and 4KB of code and it
-		requires an amount of dynamic memory that is given by the
-		formula:
-
-			(1846 + 768 << (lc + lp)) * sizeof(uint16)
-
-		Where lc and lp stand for, respectively, Literal context bits
-		and Literal pos bits.
-
-		This value is upper-bounded by 14MB in the worst case. Anyway,
-		for a ~4MB large kernel image, we have lc=3 and lp=0 for a
-		total amount of (1846 + 768 << (3 + 0)) * 2 = ~41KB... that is
-		a very small buffer.
-
-		Use the lzmainfo tool to determinate the lc and lp values and
-		then calculate the amount of needed dynamic memory (ensuring
-		the appropriate CONFIG_SYS_MALLOC_LEN value).
-
 		CONFIG_LZO
 
 		If this option is set, support for LZO compressed images

+ 1 - 0
arch/Kconfig

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

+ 1 - 0
configs/ap121_defconfig

@@ -50,3 +50,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_AR933X_UART=y
 CONFIG_DM_SPI=y
 CONFIG_ATH79_SPI=y
+CONFIG_LZMA=y

+ 1 - 0
configs/ap143_defconfig

@@ -46,3 +46,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
 CONFIG_ATH79_SPI=y
+CONFIG_LZMA=y

+ 1 - 0
configs/guruplug_defconfig

@@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/ib62x0_defconfig

@@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/iconnect_defconfig

@@ -21,4 +21,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/nsa310s_defconfig

@@ -25,4 +25,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/qemu_mips64_defconfig

@@ -15,3 +15,4 @@ CONFIG_CMD_FAT=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_LZMA=y

+ 1 - 0
configs/qemu_mips64el_defconfig

@@ -16,3 +16,4 @@ CONFIG_CMD_FAT=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_LZMA=y

+ 1 - 0
configs/qemu_mips_defconfig

@@ -13,3 +13,4 @@ CONFIG_CMD_FAT=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_LZMA=y

+ 1 - 0
configs/qemu_mipsel_defconfig

@@ -14,3 +14,4 @@ CONFIG_CMD_FAT=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_LZMA=y

+ 1 - 0
configs/sheevaplug_defconfig

@@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/tplink_wdr4300_defconfig

@@ -45,3 +45,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_STORAGE=y
+CONFIG_LZMA=y

+ 1 - 0
configs/zipitz2_defconfig

@@ -19,5 +19,6 @@ CONFIG_PXA_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
+CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

+ 0 - 1
include/configs/ap121.h

@@ -33,7 +33,6 @@
 #define CONFIG_BOOTCOMMAND              "sf probe;" \
 					"mtdparts default;" \
 					"bootm 0x9f650000"
-#define CONFIG_LZMA
 
 #define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
 #define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \

+ 0 - 1
include/configs/ap143.h

@@ -37,7 +37,6 @@
 #define CONFIG_BOOTCOMMAND              "sf probe;" \
 					"mtdparts default;" \
 					"bootm 0x9f680000"
-#define CONFIG_LZMA
 
 #define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
 #define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \

+ 0 - 1
include/configs/ib62x0.h

@@ -23,7 +23,6 @@
  * Compression configuration
  */
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
 
 /*
  * Commands configuration

+ 0 - 1
include/configs/iconnect.h

@@ -25,7 +25,6 @@
  * Compression configuration
  */
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
 #define CONFIG_LZO
 
 /*

+ 0 - 1
include/configs/mv-plug-common.h

@@ -22,7 +22,6 @@
  */
 #ifdef CONFIG_SYS_MVFS
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
 #endif /* CONFIG_SYS_MVFS */
 
 /*

+ 0 - 1
include/configs/nsa310s.h

@@ -21,7 +21,6 @@
 
 /* compression configuration */
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
 
 /* commands configuration */
 #define CONFIG_SYS_MVFS

+ 0 - 2
include/configs/qemu-mips.h

@@ -121,6 +121,4 @@
 
 #define MEM_SIZE		128
 
-#define CONFIG_LZMA
-
 #endif /* __CONFIG_H */

+ 0 - 2
include/configs/qemu-mips64.h

@@ -121,6 +121,4 @@
 
 #define MEM_SIZE		128
 
-#define CONFIG_LZMA
-
 #endif /* __CONFIG_H */

+ 0 - 1
include/configs/sandbox.h

@@ -149,7 +149,6 @@
 #define CONFIG_GZIP_COMPRESSED
 #define CONFIG_BZIP2
 #define CONFIG_LZO
-#define CONFIG_LZMA
 
 #define CONFIG_CMD_LZMADEC
 

+ 0 - 1
include/configs/tplink_wdr4300.h

@@ -36,7 +36,6 @@
 	"console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
 #define CONFIG_BOOTCOMMAND		\
 	"dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr"
-#define CONFIG_LZMA
 
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE			0x10000

+ 0 - 1
include/configs/zipitz2.h

@@ -42,7 +42,6 @@
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 #define	CONFIG_SYS_TEXT_BASE		0x0
-#define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
  * Serial Console Configuration

+ 8 - 0
lib/Kconfig

@@ -148,6 +148,14 @@ config LZ4
 	  frame format currently (2015) implemented in the Linux kernel
 	  (generated by 'lz4 -l'). The two formats are incompatible.
 
+config LZMA
+	bool "Enable LZMA decompression support"
+	help
+	  This enables support for LZMA (Lempel-Ziv-Markov chain algorithm),
+	  a dictionary compression algorithm that provides a high compression
+	  ratio and fairly fast decompression speed. See also
+	  CONFIG_CMD_LZMADEC which provides a decode command.
+
 config LZO
 	bool
 endmenu

+ 0 - 1
scripts/config_whitelist.txt

@@ -1575,7 +1575,6 @@ CONFIG_LUAN
 CONFIG_LWMON5
 CONFIG_LXT971_NO_SLEEP
 CONFIG_LYNXKDI
-CONFIG_LZMA
 CONFIG_M41T94_SPI_CS
 CONFIG_M520x
 CONFIG_M52277EVB