From 6eb91fa4861125a7a8c6ef8bb6771a8da51eff41 Mon Sep 17 00:00:00 2001
From: Vyacheslav Yurkov <uvv.mail@gmail.com>
Date: Wed, 10 Dec 2025 09:55:37 +0000
Subject: [PATCH] u-boot-stm32mp: Fix fit signing

ST implementation of signing conflicts with the one from oe-core.

Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
---
 recipes-bsp/u-boot/u-boot-stm32mp.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-stm32mp.inc b/recipes-bsp/u-boot/u-boot-stm32mp.inc
index 22b4b3ed..a46ff23c 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp.inc
@@ -210,7 +210,8 @@ export_binaries() {
                                     # Prepare original binary for signature
                                     cp -f ${B}/${config}/u-boot-${devicetree}-${type_suffix}.${binarysuffix} ${dest}/u-boot-${devicetree}-${type_suffix}-without-signature.${binarysuffix}
                                     # Sign dummy image images in order to add the image signing keys to our dtb
-                                    ${UBOOT_MKIMAGE_SIGN} \
+                                    if [ "${FIT_SIGN_INDIVIDUAL}" = "1" ] ; then
+                                        ${UBOOT_MKIMAGE_SIGN} \
                                             ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
                                             -f auto \
                                             -k "${UBOOT_SIGN_KEYDIR}" \
@@ -220,13 +221,14 @@ export_binaries() {
                                             -d /dev/null \
                                             ${UBOOT_MKIMAGE_SIGN_ARGS} \
                                             -r ${B}/${config}/unused.itb
+                                    fi
                                     # Sign dummy image configurations in order to add the configuration signing keys to our dtb
                                     ${UBOOT_MKIMAGE_SIGN} \
                                             ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
                                             -f auto-conf \
                                             -k "${UBOOT_SIGN_KEYDIR}" \
                                             -o "${FIT_HASH_ALG},${FIT_SIGN_ALG}" \
-                                            -g "${UBOOT_SIGN_IMG_KEYNAME}" \
+                                            -g "${UBOOT_SIGN_KEYNAME}" \
                                             -K "${B}/${config}/u-boot-${devicetree}-${type_suffix}.${binarysuffix}" \
                                             -d /dev/null \
                                             ${UBOOT_MKIMAGE_SIGN_ARGS} \
@@ -247,6 +249,8 @@ export_binaries() {
     fi
 }
 
+do_uboot_assemble_fitimage[noexec] = "1"
+
 do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}${FIP_DIR_UBOOT}"
 do_deploy() {
     export_binaries ${DEPLOYDIR} 1