From e4c3de8a0ac6a803b3152f2dcb4f5d6e8726cba1 Mon Sep 17 00:00:00 2001 From: Khasim Mohammed Date: Fri, 21 Aug 2020 21:39:26 +0530 Subject: [PATCH] arm/trusted-firmware-a: add support to install dtb built as part of TFA Device tree blobs (DTBs) generated as part of TFA were installed separately in the platform specific TFA recipes, its redundant as each platform was executing similar installation steps. The patch avoids skipping dtb installation and adds support to check for DTB entries in TFA_INSTALL_TARGET and install the same to respective deploy folder. Change-Id: I0f8f5c39dc4b4931d202696990fa915ea7ed60eb Issue-Id: PLATFORMS-3971 Signed-off-by: Khasim Syed Mohammed Signed-off-by: Jon Mason --- .../trusted-firmware-a/trusted-firmware-a.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 6751c2a8..cf130015 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -148,9 +148,13 @@ do_install() { ln -sf $atfbin-${TFA_PLATFORM} ${D}/firmware/$atfbin processes="1" fi - - if [ "$atfbin" = "dtbs" ]; then - echo "dtbs install, skipped" + if [ -f ${BUILD_DIR}/fdts/$atfbin.dtb ]; then + echo "Install $atfbin.dtb" + install -m 0644 "${BUILD_DIR}/fdts/$atfbin.dtb" \ + "${D}/firmware/$atfbin.dtb" + processes="1" + elif [ "$atfbin" = "dtbs" ]; then + echo "dtbs install, skipped: set dtbs in TFA_INSTALL_TARGET" elif [ -f ${B}/tools/$atfbin/$atfbin ]; then echo "Tools $atfbin install, skipped" elif [ "$processes" = "0" ]; then