From: Denys Dmytriyenko <denis@denix.org>
To: meta-ti@lists.yoctoproject.org
Cc: Denys Dmytriyenko <denys@konsulko.com>
Subject: [master/scarthgap/kirkstone][PATCH] u-boot-ti: deploy initial-env for the main machine
Date: Wed, 17 Apr 2024 17:26:16 -0400 [thread overview]
Message-ID: <20240417212616.133571-1-denis@denix.org> (raw)
From: Denys Dmytriyenko <denys@konsulko.com>
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 <denys@konsulko.com>
---
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
reply other threads:[~2024-04-17 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240417212616.133571-1-denis@denix.org \
--to=denis@denix.org \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).