mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v2 1/6] common: don't allow compressing in-barebox binaries again
Date: Thu, 14 Jul 2022 10:08:31 +0200	[thread overview]
Message-ID: <20220714080831.GI23482@pengutronix.de> (raw)
In-Reply-To: <20220713095730.1878941-1-a.fatoum@pengutronix.de>

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@pengutronix.de>
> ---
> 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 |



      parent reply	other threads:[~2022-07-14  8:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-13  9:57 Ahmad Fatoum
2022-07-13  9:57 ` [PATCH v2 2/6] pbl: make USE_COMPRESSED_DTB a PBL-only feature Ahmad Fatoum
2022-07-13  9:57 ` [PATCH v2 3/6] pbl: remove redundant select UNCOMRPESS Ahmad Fatoum
2022-07-13  9:57 ` [PATCH v2 4/6] kbuild: gen-dtb-s: use Makefile.lib instead of duplicating cmd_lzo Ahmad Fatoum
2022-07-13  9:57 ` [PATCH v2 5/6] pbl: compressed-dtb: use flexible array member to access data Ahmad Fatoum
2022-07-13  9:57 ` [PATCH v2 6/6] kbuild: pbl: use same compression algo for both barebox and DTB Ahmad Fatoum
2022-07-15 10:53   ` Sascha Hauer
2022-07-15 15:57     ` [PATCH] fixup! " Ahmad Fatoum
2022-07-14  8:08 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220714080831.GI23482@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH v2 1/6] common: don'\''t allow compressing in-barebox binaries again' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox