From 500e34c0c955ea0219e545fa1508e72b2b8cff59 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 4 Nov 2022 22:46:10 +0000 Subject: [PATCH] ti-sci-fw: Only deploy the raw SYSFW images for one machine target This recipe deploys the raw SYSFW unconditionally which causes issues when doing multiconfig builds. What should happen is only one deploys these, select that the same way we select which one deploys the default SYSFW symlink. Move the deploy step there. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 506052ca..ae90e877 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -99,6 +99,7 @@ do_deploy () { ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} if [ ! -z "${SYSFW_SYMLINK}" ]; then ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ fi fi @@ -106,10 +107,9 @@ do_deploy () { install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ fi fi - - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } addtask deploy before do_build after do_compile