On Wed, Jul 13, 2022 at 11:57:25AM +0200, Ahmad Fatoum wrote: > 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@xxxxxxxxxxxxxx> > --- > v1 -> v2: > - no change > --- > common/Kconfig | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) Applied, thanks Sascha > > diff --git a/common/Kconfig b/common/Kconfig > index 2292e7bcea46..6278866006b1 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" > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
