From 26f5767fd27389e8589187df1692cd7952730311 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Fri, 19 Dec 2025 09:47:42 -0600 Subject: [PATCH] u-boot: Update trusted-firmware-a locations A recent change in meta-arm installs all of files into a trusted-firmware-a directory. We need that added to the paths for the PACKAGECONFIG settings so that u-boot can compile. Take this opportunity to also break all of the firmware paths into separate variables in case we need to override one of them in the future. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 277ec7fe..92ec5ca8 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -64,10 +64,18 @@ PLAT_SFX:am62dxx = "am62dxx" PLAT_SFX:am62lxx = "am62lxx" PLAT_SFX:am62pxx = "am62pxx" -PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a" -PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" -PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" -PACKAGECONFIG[dm] = "TI_DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" +ATF_BL1_PATH = "${STAGING_DIR_HOST}/firmware/trusted-firmware-a/bl1.bin" + +ATF_BL31_PATH = "${STAGING_DIR_HOST}/firmware/trusted-firmware-a/bl31.bin" + +OPTEE_BL32_PATH = "${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin" + +TI_DM_PATH = "${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE}" + +PACKAGECONFIG[ap-trusted-rom] = "BL1=${ATF_BL1_PATH},,trusted-firmware-a" +PACKAGECONFIG[atf] = "BL31=${ATF_BL31_PATH},,trusted-firmware-a" +PACKAGECONFIG[optee] = "TEE=${OPTEE_BL32_PATH},,optee-os" +PACKAGECONFIG[dm] = "TI_DM=${TI_DM_PATH},,ti-dm-fw" PACKAGECONFIG:append:aarch64 = " atf optee" PACKAGECONFIG:append:j721e = " dm"