diff options
| author | Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> | 2024-10-01 10:56:47 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-10-17 15:01:14 -0600 |
| commit | 22371048ed4646376ec71061930f15d5e4181c07 (patch) | |
| tree | 90ecfe5ad65da2b9d5b097f646eb6f9dbef42324 /lib/fdtdec.c | |
| parent | 3435486f367d341cd143425c3ff9d307380d2935 (diff) | |
| download | u-boot-22371048ed4646376ec71061930f15d5e4181c07.tar.gz | |
lib: fdtdec: Parse the gzip/lzo headers only when dependencies have met
It might happen that CONFIG_GZIP and CONFIG_LZO are enabled but we might
have CONFIG_MULTI_DTB_FIT_LZO enabled in this case in the code path of
uncompress_blob() we parse the gzip headers first which results in
`Error: Bad gzipped data` being printed. To avoid this parse the gzip/lzo
headers only when dependencies have met.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 85f4426f904..b0655988029 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1172,10 +1172,10 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) void *dst; int rc; - if (CONFIG_IS_ENABLED(GZIP)) + if (CONFIG_IS_ENABLED(GZIP) && CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP)) if (gzip_parse_header(src, sz_in) >= 0) gzip = 1; - if (CONFIG_IS_ENABLED(LZO)) + if (CONFIG_IS_ENABLED(LZO) && CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO)) if (!gzip && lzop_is_valid_header(src)) lzo = 1; |