From: Denys Dmytriyenko <[email protected]> It is useful to have U-boot initial environment deployed for future reference or to initialize environment files as part of the build.
In multiconfig setup, such as TI K3 platforms, building U-boot multiple times for Cortex-R5 and Cortex-A53 cores results in file conflicts when deploying under the same name. To avoid that, those initial-env files were removed at the end of the do_deploy task. But it is better to only remove them for k3r5 multiconfig, since that only builds SPL and saved env doesn't make much sense, but preserve and deploy initial-env for the main machine multiconfig. Signed-off-by: Denys Dmytriyenko <[email protected]> --- Note: this can be applied to all 3 active branches - kirkstone, scarthgap and master meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 2c0d4fc4..bad8371f 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -221,6 +221,13 @@ do_deploy:append:k3r5 () { install -m 644 $f ${DEPLOYDIR}/ fi done + + rm ${DEPLOYDIR}/u-boot-initial-env || true + rm ${DEPLOYDIR}/${PN}-initial-env || true + rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true + rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true + rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true + rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true } do_deploy:append () { @@ -325,13 +332,6 @@ do_deploy:append () { ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} fi fi - - rm ${DEPLOYDIR}/u-boot-initial-env || true - rm ${DEPLOYDIR}/${PN}-initial-env || true - rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true - rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true - rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true - rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true } do_install:append:am62xx() { -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17592): https://lists.yoctoproject.org/g/meta-ti/message/17592 Mute This Topic: https://lists.yoctoproject.org/mt/105586711/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
