From 2bdfdc92e1c385deeae0abb75b2d4530f9d78b34 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Tue, 10 Jan 2023 13:26:39 +0100 Subject: [PATCH] u-boot-dey: remove fip 'optee' suffix from install scripts https://onedigi.atlassian.net/browse/DEL-8268 Signed-off-by: Gonzalo Ruiz --- .../recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt index d0dbb8d78..25f729acc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt @@ -8,7 +8,7 @@ install_abort=0 BASEFILENAME=0 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-nand.stm32 -setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin +setenv INSTALL_FIP_FILENAME fip-##MACHINE##.bin setenv INSTALL_MMCDEV 1 if test -z "${image-name}"; then diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt index 6831b34a7..bf3bcb0c9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt @@ -8,7 +8,7 @@ install_abort=0 BASEFILENAME=0 setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-nand.stm32 -setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin +setenv INSTALL_FIP_FILENAME fip-##MACHINE##.bin setenv INSTALL_USBDEV 0 if test -z "${image-name}"; then diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh index 8a6539163..1b59668ba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh @@ -119,7 +119,7 @@ fi # Determine FIP file to program if [ -z "${INSTALL_FIP_FILENAME}" ]; then - INSTALL_FIP_FILENAME="fip-##MACHINE##-optee.bin" + INSTALL_FIP_FILENAME="fip-##MACHINE##.bin" fi # Determine linux, recovery, and rootfs image filenames to update