Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u-boot-dey: ccmp2: fix support for flashing Trustfence artifacts 

Both boot artifacts now use the same signed label, so this commit removes
unnecessary logic and updates the UUU install script to support the new boot
artifact naming. It also fixes the detection of signed artifacts by checking
for the presence of the FIP artifact, instead of relying on a U-BOOT artifact
that does not exist on this platform.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2025-03-24 13:09:59 +01:00
parent 4be874e30f
commit c59a5fdfe9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
View File

@ -95,13 +95,9 @@ build_uboot_scripts() {
fi fi
else else
sed -i -e 's,##SIGNED##,_Signed,g' ${TMP_INSTALL_SCR} sed -i -e 's,##SIGNED##,_Signed,g' ${TMP_INSTALL_SCR}
sed -i -e 's,##SIGNED_TFA##,_signed,g' ${TMP_INSTALL_SCR}
fi fi
else else
sed -i -e 's,-##SIGNED##,,g' -e 's,##SIGNED##,,g' ${TMP_INSTALL_SCR} sed -i -e 's,-##SIGNED##,,g' -e 's,##SIGNED##,,g' ${TMP_INSTALL_SCR}
if [ "${DEY_SOC_VENDOR}" = "STM" ]; then
sed -i -e 's,##SIGNED_TFA##,,g' ${TMP_INSTALL_SCR}
fi
fi fi
if [ "${f_ext}" = "txt" ]; then if [ "${f_ext}" = "txt" ]; then
mkimage -T script -n "DEY firmware install script" -C none -d ${TMP_INSTALL_SCR} ${DEPLOYDIR}/${f%.*}.scr mkimage -T script -n "DEY firmware install script" -C none -d ${TMP_INSTALL_SCR} ${DEPLOYDIR}/${f%.*}.scr

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh
View File

@ -108,7 +108,7 @@ echo "Determining image files to use..."
# Determine ATF file to program # Determine ATF file to program
if [ -z "${INSTALL_ATF_FILENAME}" ]; then if [ -z "${INSTALL_ATF_FILENAME}" ]; then
INSTALL_ATF_FILENAME="tf-a-##MACHINE##-optee-emmc.stm32##SIGNED_TFA##" INSTALL_ATF_FILENAME="tf-a-##MACHINE##-optee-emmc##SIGNED##.stm32"
fi fi
INSTALL_METADATA_FILENAME="metadata-##MACHINE##.bin" INSTALL_METADATA_FILENAME="metadata-##MACHINE##.bin"
@ -306,7 +306,7 @@ else
fi fi
# Set the dboot_kernel_var to fitimage if Trustfence is enabled # Set the dboot_kernel_var to fitimage if Trustfence is enabled
if [ "${TRUSTFENCE}" = "true" ] || echo "${INSTALL_UBOOT_FILENAME}" | grep -q -e "signed"; then if [ "${TRUSTFENCE}" = "true" ] || echo "${INSTALL_FIP_FILENAME}" | grep -q -e "Signed"; then
uuu fb: ucmd setenv dboot_kernel_var fitimage uuu fb: ucmd setenv dboot_kernel_var fitimage
uuu fb: ucmd saveenv uuu fb: ucmd saveenv
fi fi