diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-07-13 11:57:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-07-14 10:27:41 +0200 |
| commit | 87ed5c44b3ef84835c83aa4f6375018d958ae9dc (patch) | |
| tree | 3e6c8903fb867a499951f94bb8e2413484d164d9 /common | |
| parent | 2f8704aac5bd8165f0abf15e580561373ed53d4b (diff) | |
| download | barebox-87ed5c44b3ef84835c83aa4f6375018d958ae9dc.tar.gz barebox-87ed5c44b3ef84835c83aa4f6375018d958ae9dc.tar.xz | |
common: don't allow compressing in-barebox binaries again
For barebox with a prebootloader, we can compress barebox proper as a
whole and it makes no sense to compress the environment on its own
again. The choice already defaulted to this, but the user could still
override it. Ensure that this double compression can't happen.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220713095730.1878941-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/common/Kconfig b/common/Kconfig index 2292e7bcea..6278866006 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -860,29 +860,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" |