summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlexander Dahl <ada@thorsis.com>2023-12-21 08:26:10 +0100
committerTom Rini <trini@konsulko.com>2024-01-11 22:09:11 -0500
commitb646a1053fda188bfb054acc98aa73bb23b158b1 (patch)
tree77b0537bf2afd160f3aa4406582f32e36dc03fe6 /tools
parentbbd6618fb57a70609c7eb768a6286496aa234c0d (diff)
downloadu-boot-b646a1053fda188bfb054acc98aa73bb23b158b1.tar.gz
u-boot-b646a1053fda188bfb054acc98aa73bb23b158b1.tar.bz2
u-boot-b646a1053fda188bfb054acc98aa73bb23b158b1.zip
tools: kwbimage: Allow disabling build on non-mvebu platforms
Some users want to build with CONFIG_TOOLS_LIBCRYPTO disabled, which in general is possible for at least some boards. 32-bit mvebu however requires kwbimage for building SPL, and kwbimage has a hard dependency to host OpenSSL. The new symbol CONFIG_TOOLS_KWBIMAGE allows disabling kwbimage build on non-mvebu platforms, and thus building without host libcrypto from OpenSSL. Based on previous work and discussions, see links below. Link: https://lore.kernel.org/u-boot/20211021093304.25399-1-pali@kernel.org/ Link: https://lore.kernel.org/u-boot/20220111153120.1276641-1-marex@denx.de/ Link: https://lore.kernel.org/u-boot/20230121154743.667253-2-paulerwan.rio@gmail.com/ Cc: Marek Vasut <marex@denx.de> Cc: Paul-Erwan Rio <paulerwan.rio@gmail.com> Signed-off-by: Alexander Dahl <ada@thorsis.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/Kconfig5
-rw-r--r--tools/Makefile4
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/Kconfig b/tools/Kconfig
index 6e23f44d55..f8632cd59d 100644
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -25,6 +25,11 @@ config TOOLS_LIBCRYPTO
This selection does not affect target features, such as runtime FIT
signature verification.
+config TOOLS_KWBIMAGE
+ bool "Enable kwbimage support in host tools"
+ default y
+ select TOOLS_LIBCRYPTO
+
config TOOLS_FIT
def_bool y
help
diff --git a/tools/Makefile b/tools/Makefile
index 1aa1e36137..6a4280e366 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -94,6 +94,8 @@ LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := \
generated/lib/fdt-libcrypto.o \
sunxi_toc0.o
+KWB_IMAGE_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := kwbimage.o
+
ROCKCHIP_OBS = generated/lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o
# common objs for dumpimage and mkimage
@@ -114,7 +116,7 @@ dumpimage-mkimage-objs := aisimage.o \
imximage.o \
imx8image.o \
imx8mimage.o \
- kwbimage.o \
+ $(KWB_IMAGE_OBJS-y) \
generated/lib/md5.o \
lpc32xximage.o \
mxsimage.o \