public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/1] package/uboot-tools: fix FIT signature support
@ 2026-03-30 11:57 Ferdinand Bachmann
  2026-03-30 11:57 ` [Buildroot] [PATCH 1/1] " Ferdinand Bachmann
  0 siblings, 1 reply; 3+ messages in thread
From: Ferdinand Bachmann @ 2026-03-30 11:57 UTC (permalink / raw)
  To: buildroot; +Cc: Ferdinand Bachmann

FIT signature support in uboot-tools is currently broken in buildroot
master due to changes in uboot-tools' Makefile from the big update in
2025.11. This patch fixes the changes by adding missing defines and make
options.

Note that I sent out a content-identical version of this patch a few
minutes ago that had the wrong git author (@yrlf.at instead of the
company email @go-e.com). Please disregard the previous version of this
patch series.

Ferdinand Bachmann (1):
  package/uboot-tools: fix FIT signature support

 package/uboot-tools/uboot-tools.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/uboot-tools: fix FIT signature support
  2026-03-30 11:57 [Buildroot] [PATCH 0/1] package/uboot-tools: fix FIT signature support Ferdinand Bachmann
@ 2026-03-30 11:57 ` Ferdinand Bachmann
  2026-04-01 11:29   ` Ferdinand Bachmann
  0 siblings, 1 reply; 3+ messages in thread
From: Ferdinand Bachmann @ 2026-03-30 11:57 UTC (permalink / raw)
  To: buildroot; +Cc: Ferdinand Bachmann

uboot-tools changed how the config system works for tool builds, which
leads to buildroot's configure cmds being wrong / incomplete.

Specifically, the CONFIG_FIT_* macros are now called CONFIG_TOOLS_FIT_*,
while the make options needed to compile FIT signature support are still
CONFIG_FIT_*. Additionally, CONFIG_TOOLS_LIBCRYPTO is needed to link
uboot-tools with FIT signature support correctly.

This patch fixes the issue by adding the new CONFIG_TOOLS_FIT_* defines
to the generated autoconf.h and adding CONFIG_TOOLS_LIBCRYPTO to the
make options.

Signed-off-by: Ferdinand Bachmann <ferdinand.bachmann@go-e.com>
---
 package/uboot-tools/uboot-tools.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index fa0b6aba78..99752a9b47 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -31,9 +31,12 @@ define UBOOT_TOOLS_CONFIGURE_CMDS
 	echo "#include <linux/kconfig.h>" > $(@D)/include/config.h
 	touch $(@D)/include/config/auto.conf
 	mkdir -p $(@D)/include/generated
+	touch $(@D)/include/generated/autoconf.h
 	$(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS))
 	$(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),echo '#define CONFIG_TOOLS_FIT_PRINT 1' >> $(@D)/include/generated/autoconf.h)
-	echo $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h
+	$(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_SIGNATURE 1' >> $(@D)/include/generated/autoconf.h)
+	$(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE 0x10000000' >> $(@D)/include/generated/autoconf.h)
+	$(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_RSASSA_PSS 1' >> $(@D)/include/generated/autoconf.h)
 	mkdir -p $(@D)/include/asm
 	touch $(@D)/include/asm/linkage.h
 endef
@@ -50,7 +53,7 @@ UBOOT_TOOLS_DEPENDENCIES += dtc
 endif
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y)
-UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
+UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 CONFIG_TOOLS_LIBCRYPTO=y
 UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf
 endif
 
@@ -124,9 +127,12 @@ define HOST_UBOOT_TOOLS_CONFIGURE_CMDS
 	echo "#include <linux/kconfig.h>" > $(@D)/include/config.h
 	touch $(@D)/include/config/auto.conf
 	mkdir -p $(@D)/include/generated
+	touch $(@D)/include/generated/autoconf.h
 	$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS))
 	$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),echo '#define CONFIG_TOOLS_FIT_PRINT 1' >> $(@D)/include/generated/autoconf.h)
-	echo $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h
+	$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_SIGNATURE 1' >> $(@D)/include/generated/autoconf.h)
+	$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE 0x10000000' >> $(@D)/include/generated/autoconf.h)
+	$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo '#define CONFIG_TOOLS_FIT_RSASSA_PSS 1' >> $(@D)/include/generated/autoconf.h)
 	mkdir -p $(@D)/include/asm
 	touch $(@D)/include/asm/linkage.h
 endef
@@ -142,7 +148,7 @@ HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc
 endif
 
 ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y)
-HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
+HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 CONFIG_TOOLS_LIBCRYPTO=y
 HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl
 define HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN
 	$(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign $(HOST_DIR)/bin/fit_check_sign
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/uboot-tools: fix FIT signature support
  2026-03-30 11:57 ` [Buildroot] [PATCH 1/1] " Ferdinand Bachmann
@ 2026-04-01 11:29   ` Ferdinand Bachmann
  0 siblings, 0 replies; 3+ messages in thread
From: Ferdinand Bachmann @ 2026-04-01 11:29 UTC (permalink / raw)
  To: buildroot


[-- Attachment #1.1: Type: text/plain, Size: 4807 bytes --]

I double-checked this and it seems like this also needs
`BR2_PACKAGE_OPENSSL_ENGINES=y` to build correctly, since part of
uboot-tools seems to depend on the openssl `ENGINE_*` family of functions
now when FIT_SIGNATURE support is enabled.

See also the related GitLab work item:
https://gitlab.com/buildroot.org/buildroot/-/work_items/173

On Mon, 30 Mar 2026 at 13:57, Ferdinand Bachmann <
ferdinand.bachmann@go-e.com> wrote:

> uboot-tools changed how the config system works for tool builds, which
> leads to buildroot's configure cmds being wrong / incomplete.
>
> Specifically, the CONFIG_FIT_* macros are now called CONFIG_TOOLS_FIT_*,
> while the make options needed to compile FIT signature support are still
> CONFIG_FIT_*. Additionally, CONFIG_TOOLS_LIBCRYPTO is needed to link
> uboot-tools with FIT signature support correctly.
>
> This patch fixes the issue by adding the new CONFIG_TOOLS_FIT_* defines
> to the generated autoconf.h and adding CONFIG_TOOLS_LIBCRYPTO to the
> make options.
>
> Signed-off-by: Ferdinand Bachmann <ferdinand.bachmann@go-e.com>
> ---
>  package/uboot-tools/uboot-tools.mk | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/
> uboot-tools.mk
> index fa0b6aba78..99752a9b47 100644
> --- a/package/uboot-tools/uboot-tools.mk
> +++ b/package/uboot-tools/uboot-tools.mk
> @@ -31,9 +31,12 @@ define UBOOT_TOOLS_CONFIGURE_CMDS
>         echo "#include <linux/kconfig.h>" > $(@D)/include/config.h
>         touch $(@D)/include/config/auto.conf
>         mkdir -p $(@D)/include/generated
> +       touch $(@D)/include/generated/autoconf.h
>         $(if
> $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS))
>         $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),echo '#define
> CONFIG_TOOLS_FIT_PRINT 1' >> $(@D)/include/generated/autoconf.h)
> -       echo $(if
> $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define
> CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h
> +       $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_SIGNATURE 1' >>
> $(@D)/include/generated/autoconf.h)
> +       $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE 0x10000000' >>
> $(@D)/include/generated/autoconf.h)
> +       $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_RSASSA_PSS 1' >>
> $(@D)/include/generated/autoconf.h)
>         mkdir -p $(@D)/include/asm
>         touch $(@D)/include/asm/linkage.h
>  endef
> @@ -50,7 +53,7 @@ UBOOT_TOOLS_DEPENDENCIES += dtc
>  endif
>
>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y)
> -UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
> +UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 CONFIG_TOOLS_LIBCRYPTO=y
>  UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf
>  endif
>
> @@ -124,9 +127,12 @@ define HOST_UBOOT_TOOLS_CONFIGURE_CMDS
>         echo "#include <linux/kconfig.h>" > $(@D)/include/config.h
>         touch $(@D)/include/config/auto.conf
>         mkdir -p $(@D)/include/generated
> +       touch $(@D)/include/generated/autoconf.h
>         $(if
> $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),$(UBOOT_TOOLS_ENABLE_HASH_ALGOS))
>         $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),echo '#define
> CONFIG_TOOLS_FIT_PRINT 1' >> $(@D)/include/generated/autoconf.h)
> -       echo $(if
> $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),'#define
> CONFIG_FIT_SIGNATURE 1') >> $(@D)/include/generated/autoconf.h
> +       $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_SIGNATURE 1' >>
> $(@D)/include/generated/autoconf.h)
> +       $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE 0x10000000' >>
> $(@D)/include/generated/autoconf.h)
> +       $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),echo
> '#define CONFIG_TOOLS_FIT_RSASSA_PSS 1' >>
> $(@D)/include/generated/autoconf.h)
>         mkdir -p $(@D)/include/asm
>         touch $(@D)/include/asm/linkage.h
>  endef
> @@ -142,7 +148,7 @@ HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc
>  endif
>
>  ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y)
> -HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
> +HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 CONFIG_TOOLS_LIBCRYPTO=y
>  HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl
>  define HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN
>         $(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign
> $(HOST_DIR)/bin/fit_check_sign
> --
> 2.53.0
>
>

[-- Attachment #1.2: Type: text/html, Size: 6099 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-04-01 11:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-30 11:57 [Buildroot] [PATCH 0/1] package/uboot-tools: fix FIT signature support Ferdinand Bachmann
2026-03-30 11:57 ` [Buildroot] [PATCH 1/1] " Ferdinand Bachmann
2026-04-01 11:29   ` Ferdinand Bachmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox