Broken build with disabling OpenSSL crypto

[Alex G.]

Hi Jernej,

On 10/6/21 4:27 PM, Jernej Škrabec wrote:
> Hi everyone!
> 
> Commit cb9faa6f98ae ("tools: Use a single target-independent config to enable
> OpenSSL") recently introduced option to disable usage of OpenSSL via
> CONFIG_TOOLS_LIBCRYPTO. However, just a bit later, another commit b4f3cc2c42d9
> ("tools: kwbimage: Do not hide usage of secure header under
> CONFIG_ARMADA_38X") made U-Boot tools hard dependent on OpenSSL. That totally
> defeats the purpose of first commit. I suggest that it gets reverted.
> 
> I would like disable OpenSSL for my usage, since it gives me troubles when
> cross-compiling U-Boot inside LibreELEC build system. It's not needed for our
> case anyway.
> 
> Best regards,
> 

Can you please give the following diff a try, and if it works for you, submit as patch?

Alex

diff --git a/tools/Makefile b/tools/Makefile
index 4a86321f64..7f72ff9645 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -96,7 +96,8 @@ AES_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/aes/, \

  # Cryptographic helpers that depend on openssl/libcrypto
  LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix lib/, \
-					fdt-libcrypto.o)
+					fdt-libcrypto.o) \
+					kwbimage.o

  ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o

@@ -117,7 +118,6 @@ dumpimage-mkimage-objs := aisimage.o \
  			imximage.o \
  			imx8image.o \
  			imx8mimage.o \
-			kwbimage.o \
  			lib/md5.o \
  			lpc32xximage.o \
  			mxsimage.o \
@@ -169,8 +169,8 @@ HOST_EXTRACFLAGS	+= -DCONFIG_FIT_SIGNATURE_MAX_SIZE=0xffffffff
  HOST_EXTRACFLAGS	+= -DCONFIG_FIT_CIPHER
  endif

-# MXSImage needs LibSSL
-ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),)
+# MXSImage needs LibSSL <- Nope! Read the frogging notice at the top
+ifneq ($(CONFIG_TOOLS_LIBCRYPTO),)
  HOSTCFLAGS_kwbimage.o += \
  	$(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "")
  HOSTLDLIBS_mkimage += \