diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2024-04-17 17:26:16 -0400 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2024-04-19 10:19:40 -0500 |
commit | ff51c7f52f32ffcc6b023f85dedfd9c929fa53a4 (patch) | |
tree | d665b70ed3329a626edd614714b1a578ff9cd355 | |
parent | 11f440869aa0796dcf8c5b89f12b1d1fd3d022e7 (diff) | |
download | meta-ti-ff51c7f52f32ffcc6b023f85dedfd9c929fa53a4.tar.gz |
u-boot-ti: deploy initial-env for the main machine
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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 14 |
1 files 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 () { | |||
221 | install -m 644 $f ${DEPLOYDIR}/ | 221 | install -m 644 $f ${DEPLOYDIR}/ |
222 | fi | 222 | fi |
223 | done | 223 | done |
224 | |||
225 | rm ${DEPLOYDIR}/u-boot-initial-env || true | ||
226 | rm ${DEPLOYDIR}/${PN}-initial-env || true | ||
227 | rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true | ||
228 | rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true | ||
229 | rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true | ||
230 | rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true | ||
224 | } | 231 | } |
225 | 232 | ||
226 | do_deploy:append () { | 233 | do_deploy:append () { |
@@ -325,13 +332,6 @@ do_deploy:append () { | |||
325 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} | 332 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} |
326 | fi | 333 | fi |
327 | fi | 334 | fi |
328 | |||
329 | rm ${DEPLOYDIR}/u-boot-initial-env || true | ||
330 | rm ${DEPLOYDIR}/${PN}-initial-env || true | ||
331 | rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true | ||
332 | rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true | ||
333 | rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true | ||
334 | rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true | ||
335 | } | 335 | } |
336 | 336 | ||
337 | do_install:append:am62xx() { | 337 | do_install:append:am62xx() { |