diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-11 13:42:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-11 13:42:52 +0200 |
| commit | c31dcb7c85be3fa7236565896a48638ccfdc2965 (patch) | |
| tree | 25d4e699a8652f2604ed7d803e58ad67dc7b1ef8 /common | |
| parent | 3dc2f29d6071e6a77204658eea79b9832fd37ba3 (diff) | |
| parent | 56790054fa8bf031acfa14e34c20501bb615e3b5 (diff) | |
| download | barebox-c31dcb7c85be3fa7236565896a48638ccfdc2965.tar.gz barebox-c31dcb7c85be3fa7236565896a48638ccfdc2965.tar.xz | |
Merge branch 'for-next/compression'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/common/Kconfig b/common/Kconfig index 2292e7bcea..60f52a10e1 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -41,12 +41,6 @@ config BLOCK config BLOCK_WRITE bool -config USE_COMPRESSED_DTB - bool - depends on ARM || RISCV - select UNCOMPRESS - select LZO_DECOMPRESS - config FILETYPE bool @@ -860,29 +854,30 @@ choice default DEFAULT_COMPRESSION_LZ4 if LZ4_DECOMPRESS default DEFAULT_COMPRESSION_BZIP2 if BZLIB help - Select the default compression for in-barebox binary files. Files - compiled into barebox like for example the default environment will - be compressed with this compression type. + For barebox builds without a prebootloader, select here the default + compression for in-barebox binary files. barebox itself can't be + compressed without a prebootloader, but for example the default + environment will be compressed with this compression type. config DEFAULT_COMPRESSION_GZIP bool "gzip" - depends on ZLIB + depends on !PBL_IMAGE && ZLIB config DEFAULT_COMPRESSION_BZIP2 bool "bzip2" - depends on BZLIB + depends on !PBL_IMAGE && BZLIB config DEFAULT_COMPRESSION_LZO bool "lzo" - depends on LZO_DECOMPRESS + depends on !PBL_IMAGE && LZO_DECOMPRESS config DEFAULT_COMPRESSION_LZ4 bool "lz4" - depends on LZ4_DECOMPRESS + depends on !PBL_IMAGE && LZ4_DECOMPRESS config DEFAULT_COMPRESSION_XZ bool "xz" - depends on XZ_DECOMPRESS + depends on !PBL_IMAGE && XZ_DECOMPRESS config DEFAULT_COMPRESSION_NONE bool "no compression" |