[PATCH] [arm-bsp] trusted-firmware-a-fvp: Fix dependency loop

[PATCH] [arm-bsp] trusted-firmware-a-fvp: Fix dependency loop

[Bertrand Marquis]

From: Diego Sueiro <diego.sueiro@arm.com>

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 <diego.sueiro@arm.com>
---
 .../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 3e58ecf..27031eb 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"
-- 
2.17.1

Re: [meta-arm] [PATCH] [arm-bsp] trusted-firmware-a-fvp: Fix dependency loop

[Jon Mason]

On Thu, May 07, 2020 at 11:35:23AM +0100, Bertrand Marquis wrote:
> From: Diego Sueiro <diego.sueiro@arm.com>
> 
> 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 <diego.sueiro@arm.com>

Applied to the master branch of meta-arm.

Thanks,
Jon

> ---
>  .../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 3e58ecf..27031eb 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"
> -- 
> 2.17.1
> 

>