From 4e9d72d659eeed384903003fbe102aa79ed65fae Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Tue, 26 Sep 2023 16:35:07 -0400 Subject: [PATCH] u-boot: rename firmware dependency In anticipation of Rockchip SoC families to which the TF-A project has not been ported, the initial boot firmware needs to come from other sources (e.g. Rockchip's rkbin binaries). Update the variable used to describe this dependency to be more generic and not TF-A specific. Signed-off-by: Trevor Woerner --- recipes-bsp/u-boot/u-boot%.bbappend | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend index db8e016..050f55e 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -9,14 +9,13 @@ DEPENDS:append:rock-pi-4 = " gnutls-native" # various machines require the pyelftools library for parsing dtb files DEPENDS:append = " python3-pyelftools-native" -ATF_DEPENDS ??= "" +INIT_FIRMWARE_DEPENDS ??= "" EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -ATF_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -ATF_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" -ATF_DEPENDS:px30 = " trusted-firmware-a:do_deploy" - -do_compile[depends] .= "${ATF_DEPENDS}" +INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" +do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"