diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-12 12:02:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-12 12:02:50 -0400 |
| commit | 8a33cb8b6bdf8a35f931fcc3d8aa15254cfc4b23 (patch) | |
| tree | 3eaf43d4936e1b8846f0260d95ba10271ee31a0f /lib | |
| parent | fa6365b7c7cf06f3de0aaf55d1c8cd1e5bb30151 (diff) | |
| parent | 42f43aa25876d1c77002ee5f333ab36dcb01d719 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 12 | ||||
| -rw-r--r-- | lib/Makefile | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index fe337acaeb..628ef8ddb6 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -176,6 +176,18 @@ config LZO bool "Enable LZO decompression support" help This enables support for LZO compression algorithm.r + +config SPL_GZIP + bool "Enable gzip decompression support for SPL build" + select SPL_ZLIB + help + This enables support for GZIP compression altorithm for SPL boot. + +config SPL_ZLIB + bool + help + This enables compression lib for SPL boot. + endmenu config ERRNO_STR diff --git a/lib/Makefile b/lib/Makefile index 2eef1eb80e..da6a11aca3 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_EFI) += efi/ obj-$(CONFIG_EFI_LOADER) += efi_loader/ obj-$(CONFIG_LZMA) += lzma/ obj-$(CONFIG_LZO) += lzo/ -obj-$(CONFIG_ZLIB) += zlib/ obj-$(CONFIG_BZIP2) += bzip2/ obj-$(CONFIG_TIZEN) += tizen/ obj-$(CONFIG_FIT) += libfdt/ @@ -26,7 +25,6 @@ obj-y += crc16.o obj-$(CONFIG_ERRNO_STR) += errno_str.o obj-$(CONFIG_FIT) += fdtdec_common.o obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o -obj-$(CONFIG_GZIP) += gunzip.o obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o obj-y += initcall.o @@ -49,6 +47,9 @@ obj-$(CONFIG_RSA) += rsa/ obj-$(CONFIG_SHA1) += sha1.o obj-$(CONFIG_SHA256) += sha256.o +obj-$(CONFIG_$(SPL_)ZLIB) += zlib/ +obj-$(CONFIG_$(SPL_)GZIP) += gunzip.o + obj-$(CONFIG_$(SPL_TPL_)SAVEENV) += qsort.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/ ifneq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy) |