[PATCH] tools: Do not build kwbimage if CONFIG_TOOLS_LIBCRYPTO=n

Pali Rohár pali at kernel.org
Tue Jan 11 16:36:34 CET 2022


On Tuesday 11 January 2022 16:31:20 Marek Vasut wrote:
> The kwbimage has hard dependency on OpenSSL, do not build it
> in case TOOLS_LIBCRYPTO is disabled.

This patch does not work as kwbimage is required for 32-bit Armada
platforms. So kwbimage.o cannot be disabled on these platforms.

There is already proposal for fixing this issue:
https://patchwork.ozlabs.org/project/uboot/patch/20211021093304.25399-1-pali@kernel.org/

> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> Cc: Marek Behún <marek.behun at nic.cz>
> Cc: Pali Rohár <pali at kernel.org>
> Cc: Stefan Roese <sr at denx.de>
> Cc: Tom Rini <trini at konsulko.com>
> ---
>  tools/Makefile | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index 1763f44cac4..72488315d9d 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -101,6 +101,9 @@ LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/, \
>  ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o
>  
>  # common objs for dumpimage and mkimage
> +ifdef CONFIG_TOOLS_LIBCRYPTO
> +KWB_IMAGE_OBJS-y := kwbimage.o
> +endif
>  dumpimage-mkimage-objs := aisimage.o \
>  			atmelimage.o \
>  			$(FIT_OBJS-y) \
> @@ -118,7 +121,7 @@ dumpimage-mkimage-objs := aisimage.o \
>  			imximage.o \
>  			imx8image.o \
>  			imx8mimage.o \
> -			kwbimage.o \
> +			$(KWB_IMAGE_OBJS-y) \
>  			lib/md5.o \
>  			lpc32xximage.o \
>  			mxsimage.o \
> -- 
> 2.34.1
> 


More information about the U-Boot mailing list