From dc19078620b36d479d4a25f65979b79c01c14491 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 13 Mar 2025 16:36:25 +0100
Subject: [PATCH] stm-st-stm32mp: fip-stm32mp: Fix sign key processing

This commit corrects an issue in the sign key processing when the SoC name does
not match the FIP device tree name.

https://onedigi.atlassian.net/browse/DEL-9442

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-bsp/fip-stm32mp/fip-stm32mp.bbappend          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/fip-stm32mp/fip-stm32mp.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/fip-stm32mp/fip-stm32mp.bbappend
index 6f9ccebd0..a183eee65 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/fip-stm32mp/fip-stm32mp.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/fip-stm32mp/fip-stm32mp.bbappend
@@ -19,8 +19,8 @@ python set_fip_sign_key() {
                 d.setVar('SIGN_KEY_PASS', p)
 }
 # Addons parameters for FIP_WRAPPER
-FIP_SOC_SEARCH ?= ""
-FIP_SOC_SEARCH:ccmp2 ?= " stm32mp25 "
+FIP_SOC_SEARCH ?= " ${STM32MP_SOC_NAME} "
+FIP_SOC_MATCH ?= " ${DIGI_SOM} "
 
 # Deploy the fip binary for current target
 do_deploy() {
@@ -83,7 +83,9 @@ do_deploy() {
                     unset k
                     for soc in ${STM32MP_SOC_NAME}; do
                         k=$(expr $k + 1)
-                        [ "$(echo ${dt} | grep -c ${soc})" -eq 1 ] && sign_key=$(echo ${SIGN_KEY_PATH_LIST} | cut -d',' -f${k})
+                        if [ "$(echo ${dt} | grep -c ${soc})" -eq 1 ] || [ "$(echo ${dt} | grep -c ${FIP_SOC_MATCH})" -eq 1 ] ;then
+                            sign_key=$(echo ${SIGN_KEY_PATH_LIST} | cut -d',' -f${k})
+                        fi
                     done
                 fi
                 FIP_PARAM_SIGN="--sign --signature-key $sign_key --signature-key-pass $sign_single_key_pass"