From 03139a93246606338caecd0bbe1e6a53b7d14a8a Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 7 May 2020 11:35:23 +0100 Subject: [PATCH] arm-bsp: trusted-firmware-a-fvp: Fix dependency loop When building with INITRAMFS_IMAGE_BUNDLE set, there is a dependency loop between trusted-firmware-a:do_install and virtual/kernel:do_deploy since the trusted-firmware-a:do_install depends on the kernel dtb to be passed to the fiptool to generate the fip.bin binary. The kernel dtb is not mandatory to generate the fip.bin if we compile the "dtbs" and "fip" targets which will include the in-tree device-tree used for the --hw-config (HW_CONFIG property) dynamic configuration during the cold boot. Change-Id: I7147cc1eeecb7c4b66f198562163438b7b663eba Issue-Id: SCM-990 Signed-off-by: Diego Sueiro Reviewed-by: Bertrand Marquis Signed-off-by: Jon Mason --- .../trusted-firmware-a-fvp.inc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc index 3e58ecfa..27031ebc 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc @@ -10,21 +10,4 @@ TFA_PLATFORM = "fvp" TFA_DEBUG = "1" TFA_MBEDTLS = "1" TFA_UBOOT = "1" -TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fiptool" - -do_install[depends] += "virtual/kernel:do_deploy" - -do_install_append() { - ./tools/fiptool/fiptool create \ - --tb-fw ${S}/${TFA_BUILD_DIR}/bl2.bin \ - --soc-fw ${S}/${TFA_BUILD_DIR}/bl31.bin \ - --tb-fw-config ${S}/${TFA_BUILD_DIR}/fdts/fvp_tb_fw_config.dtb \ - --soc-fw-config ${S}/${TFA_BUILD_DIR}/fdts/fvp_soc_fw_config.dtb \ - --hw-config ${DEPLOY_DIR_IMAGE}/$(basename ${KERNEL_DEVICETREE}) \ - --nt-fw ${DEPLOY_DIR_IMAGE}/u-boot.bin \ - fip.bin - - ./tools/fiptool/fiptool info fip.bin - - install -m 0644 ${S}/fip.bin ${D}/firmware/fip-fvp.bin -} +TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip"