From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tim Harvey Date: Wed, 13 Jan 2021 09:00:22 -0800 Subject: [PATCH 1/4] Respect that some compression algos can be enabled separately for SPL In-Reply-To: <1610557225-3822-1-git-send-email-tharvey@gateworks.com> References: <1610557225-3822-1-git-send-email-tharvey@gateworks.com> Message-ID: <1610557225-3822-2-git-send-email-tharvey@gateworks.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Frieder Schrempf Some compression algorithms currently can be enabled for SPL and U-Boot proper separately. Therefore we need to use CONFIG_IS_ENABLED() in these cases and also prevent compiling these functions in case of a host tool build. Signed-off-by: Frieder Schrempf Signed-off-by: Tim Harvey --- common/image.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/image.c b/common/image.c index 451fc68..bda19c0 100644 --- a/common/image.c +++ b/common/image.c @@ -72,6 +72,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, #include #include +#include #ifndef CONFIG_SYS_BARGSIZE #define CONFIG_SYS_BARGSIZE 512 @@ -460,13 +461,13 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, else ret = -ENOSPC; break; -#ifdef CONFIG_GZIP +#if CONFIG_IS_ENABLED(GZIP) && !defined(USE_HOSTCC) case IH_COMP_GZIP: { ret = gunzip(load_buf, unc_len, image_buf, &image_len); break; } #endif /* CONFIG_GZIP */ -#ifdef CONFIG_BZIP2 +#if CONFIG_IS_ENABLED(BZIP2) && !defined(USE_HOSTCC) case IH_COMP_BZIP2: { uint size = unc_len; @@ -482,7 +483,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, break; } #endif /* CONFIG_BZIP2 */ -#ifdef CONFIG_LZMA +#if CONFIG_IS_ENABLED(LZMA) && !defined(USE_HOSTCC) case IH_COMP_LZMA: { SizeT lzma_len = unc_len; @@ -492,7 +493,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, break; } #endif /* CONFIG_LZMA */ -#ifdef CONFIG_LZO +#if CONFIG_IS_ENABLED(LZO) && !defined(USE_HOSTCC) case IH_COMP_LZO: { size_t size = unc_len; @@ -501,7 +502,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, break; } #endif /* CONFIG_LZO */ -#ifdef CONFIG_LZ4 +#if CONFIG_IS_ENABLED(LZ4) && !defined(USE_HOSTCC) case IH_COMP_LZ4: { size_t size = unc_len; @@ -510,7 +511,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type, break; } #endif /* CONFIG_LZ4 */ -#ifdef CONFIG_ZSTD +#if CONFIG_IS_ENABLED(ZSTD) && !defined(USE_HOSTCC) case IH_COMP_ZSTD: { size_t size = unc_len; ZSTD_DStream *dstream; -- 2.7.4