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

meta-digi-arm: ccmp25-dvk: fix boot artifact names 

Based on the boot schemes and sources supported for each platform, the boot
artifacts now include this information in their filenames. This commit updates
the filenames accordingly in several recipes.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2024-12-19 09:47:07 +01:00
parent d48a96aa24
commit 929886eeea
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-arm/conf/machine/ccmp25-dvk.conf
View File

@ -142,9 +142,9 @@ ST_USERFS = "0"
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
arm-trusted-firmware/tf-a-ccmp25-dvk-emmc.stm32 \ arm-trusted-firmware/tf-a-ccmp25-dvk-optee-emmc.stm32 \
fip/fip-ccmp25-dvk-optee.bin \ arm-trusted-firmware/metadata-ccmp25-dvk.bin \
metadata-ccmp25-dvk.bin \ fip/fip-ccmp25-dvk-optee-emmc.bin \
" "
# Per-machine DISTRO_FEATURES customization # Per-machine DISTRO_FEATURES customization

4
meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
View File

@ -68,8 +68,8 @@ do_deploy:append() {
# Last value of 'dt' is good for metadata binary, so use that. # Last value of 'dt' is good for metadata binary, so use that.
if [ "${TF_A_ENABLE_METADATA}" = "1" ]; then if [ "${TF_A_ENABLE_METADATA}" = "1" ]; then
if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_METADATA_BINARY}" ]; then if [ -f "${DEPLOYDIR}/${TF_A_METADATA_BINARY}" ]; then
ln -s "arm-trusted-firmware/${TF_A_METADATA_BINARY}" "${DEPLOYDIR}/${TF_A_METADATA_NAME}-${dt}.${TF_A_METADATA_SUFFIX}" ln -s "${TF_A_METADATA_BINARY}" "${DEPLOYDIR}/${TF_A_METADATA_NAME}-${dt}.${TF_A_METADATA_SUFFIX}"
fi fi
fi fi

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
View File

@ -7,9 +7,9 @@
install_abort=0 install_abort=0
BASEFILENAME=0 BASEFILENAME=0
setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-emmc.stm32 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-optee-emmc.stm32
setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin
setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee-emmc.bin
setenv INSTALL_MMCDEV 2 setenv INSTALL_MMCDEV 2
if test -z "${image-name}"; then if test -z "${image-name}"; then

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
View File

@ -7,9 +7,9 @@
install_abort=0 install_abort=0
BASEFILENAME=0 BASEFILENAME=0
setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-emmc.stm32 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-optee-emmc.stm32
setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin
setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee-emmc.bin
setenv INSTALL_USBDEV 0 setenv INSTALL_USBDEV 0
if test -z "${image-name}"; then if test -z "${image-name}"; then

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

@ -108,13 +108,13 @@ 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##-emmc.stm32##SIGNED_TFA##" INSTALL_ATF_FILENAME="tf-a-##MACHINE##-optee-emmc.stm32##SIGNED_TFA##"
fi fi
INSTALL_METADATA_FILENAME="metadata-##MACHINE##.bin" INSTALL_METADATA_FILENAME="metadata-##MACHINE##.bin"
# Determine FIP file to program # Determine FIP file to program
if [ -z "${INSTALL_FIP_FILENAME}" ]; then if [ -z "${INSTALL_FIP_FILENAME}" ]; then
INSTALL_FIP_FILENAME="fip-##MACHINE##-optee##SIGNED##.bin" INSTALL_FIP_FILENAME="fip-##MACHINE##-optee-emmc##SIGNED##.bin"
fi fi
# remove redirect # remove redirect