From 09e302d5efa44142c38833a6ecdfb2235cfb90e0 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 2 Apr 2024 17:53:37 +0200 Subject: [PATCH] tf-a-stm32mp: fix set_fip_sign_key() to obtain the key password This commit fixes the set_fip_sign_key() function to match the new keys format where there is a key_pass file for each key, no longer needing to search with the key index. Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index ea93c7e6d..7f1acace1 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend @@ -44,12 +44,9 @@ python set_fip_sign_key() { passfile = d.getVar('TRUSTFENCE_PASSWORD_FILE') if (os.path.isfile(passfile)): with open(passfile, "r") as file: - p = file.read().split() - i = int(d.getVar('TRUSTFENCE_KEY_INDEX')) - if (i > 7): - i = 0 + p = file.read().strip() if (p): - d.setVar('FIP_SIGN_KEY_PASS', p[i]) + d.setVar('FIP_SIGN_KEY_PASS', p) } do_deploy:append() {