mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
Respect that some compression algos can be enabled separately for SPL
Some compression algorithms currently can be enabled for SPL and U-Boot proper separately. Therefore take into account USE_HOSTCC is well as CONFIG_IS_ENABLED() in these cases to prevent compiling these functions in case of a host tool build. Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
parent
deb78ff34e
commit
3bbe1a7faf
1 changed files with 18 additions and 6 deletions
|
@ -462,13 +462,16 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
else
|
||||
ret = -ENOSPC;
|
||||
break;
|
||||
#ifdef CONFIG_GZIP
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(GZIP)
|
||||
case IH_COMP_GZIP: {
|
||||
ret = gunzip(load_buf, unc_len, image_buf, &image_len);
|
||||
break;
|
||||
}
|
||||
#endif /* CONFIG_GZIP */
|
||||
#ifdef CONFIG_BZIP2
|
||||
#endif
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(BZIP2)
|
||||
case IH_COMP_BZIP2: {
|
||||
uint size = unc_len;
|
||||
|
||||
|
@ -484,7 +487,9 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
break;
|
||||
}
|
||||
#endif /* CONFIG_BZIP2 */
|
||||
#ifdef CONFIG_LZMA
|
||||
#endif
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(LZMA)
|
||||
case IH_COMP_LZMA: {
|
||||
SizeT lzma_len = unc_len;
|
||||
|
||||
|
@ -494,7 +499,9 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
break;
|
||||
}
|
||||
#endif /* CONFIG_LZMA */
|
||||
#ifdef CONFIG_LZO
|
||||
#endif
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(LZO)
|
||||
case IH_COMP_LZO: {
|
||||
size_t size = unc_len;
|
||||
|
||||
|
@ -503,7 +510,9 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
break;
|
||||
}
|
||||
#endif /* CONFIG_LZO */
|
||||
#ifdef CONFIG_LZ4
|
||||
#endif
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(LZ4)
|
||||
case IH_COMP_LZ4: {
|
||||
size_t size = unc_len;
|
||||
|
||||
|
@ -512,7 +521,9 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
break;
|
||||
}
|
||||
#endif /* CONFIG_LZ4 */
|
||||
#ifdef CONFIG_ZSTD
|
||||
#endif
|
||||
#ifndef USE_HOSTCC
|
||||
#if CONFIG_IS_ENABLED(ZSTD)
|
||||
case IH_COMP_ZSTD: {
|
||||
size_t size = unc_len;
|
||||
ZSTD_DStream *dstream;
|
||||
|
@ -562,6 +573,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
|
|||
break;
|
||||
}
|
||||
#endif /* CONFIG_ZSTD */
|
||||
#endif
|
||||
default:
|
||||
printf("Unimplemented compression type %d\n", comp);
|
||||
return -ENOSYS;
|
||||
|
|
Loading…
Reference in a new issue