From: Andrew Davis <a...@ti.com>
We already cd into DEPLOYDIR so this is not needed. This now matches the
keystone version below. Also fixes build in some odd situations.
Signed-off-by: Andrew Davis <a...@ti.com>
Signed-off-by: Ryan Eatmon <reat...@ti.com>
Signed-off-by: Denys Dmytriyenko <de...@konsulko.com>
---
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 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 7a22161d..d29c80cf 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
@@ -174,15 +174,15 @@ do_deploy:append () {
then
cd ${DEPLOYDIR}
if [ "x${SPL_UART_BINARY}" != "x" ];
then
- install
${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type}
- rm -f
${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
- ln -sf
${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type}
- ln -sf
${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}
- ln -sf
${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type}
- ln -sf
${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+ install
${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
+ rm -f ${SPL_UART_BINARY}
${SPL_UART_SYMLINK}
+ ln -sf
${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
+ ln -sf
${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
+ ln -sf
${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
+ ln -sf
${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
fi
if [ -f
${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
- install
${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type}
+ install
${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
rm -f ${UBOOT_HS_XLD_BINARY}
${UBOOT_HS_XLD_SYMLINK}
ln -sf
${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
ln -sf
${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
@@ -190,7 +190,7 @@ do_deploy:append () {
ln -sf
${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
fi
if [ -f
${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
- install
${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type}
+ install
${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
rm -f ${UBOOT_HS_MLO_BINARY}
${UBOOT_HS_MLO_SYMLINK}
ln -sf
${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
ln -sf
${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
@@ -198,7 +198,7 @@ do_deploy:append () {
ln -sf
${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
fi
if [ -f
${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
- install
${B}/${config}/${UBOOT_HS_ISSW_BINARY}
${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type}
+ install
${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
rm -f ${UBOOT_HS_ISSW_BINARY}
${UBOOT_HS_ISSW_SYMLINK}
ln -sf
${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
ln -sf
${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
@@ -206,7 +206,7 @@ do_deploy:append () {
ln -sf
${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
fi
if [ -f
${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
- install
${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type}
+ install
${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
rm -f ${UBOOT_HS_2ND_BINARY}
${UBOOT_HS_2ND_SYMLINK}
ln -sf
${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
ln -sf
${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
@@ -221,31 +221,31 @@ do_deploy:append () {
else
cd ${DEPLOYDIR}
if [ "x${SPL_UART_BINARY}" != "x" ]; then
- install ${B}/spl/${SPL_UART_BINARY}
${DEPLOYDIR}/${SPL_UART_IMAGE}
- rm -f ${DEPLOYDIR}/${SPL_UART_BINARY}
${DEPLOYDIR}/${SPL_UART_SYMLINK}
- ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
- ln -sf ${SPL_UART_IMAGE}
${DEPLOYDIR}/${SPL_UART_SYMLINK}
+ install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
+ rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+ ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
+ ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
fi
if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
- install ${B}/${UBOOT_HS_XLD_BINARY}
${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+ install ${B}/${UBOOT_HS_XLD_BINARY}
${UBOOT_HS_XLD_IMAGE}
rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
fi
if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
- install ${B}/${UBOOT_HS_MLO_BINARY}
${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+ install ${B}/${UBOOT_HS_MLO_BINARY}
${UBOOT_HS_MLO_IMAGE}
rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
fi
if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
- install ${B}/${UBOOT_HS_ISSW_BINARY}
${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}
+ install ${B}/${UBOOT_HS_ISSW_BINARY}
${UBOOT_HS_ISSW_IMAGE}
rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
fi
if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
- install ${B}/${UBOOT_HS_2ND_BINARY}
${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}
+ install ${B}/${UBOOT_HS_2ND_BINARY}
${UBOOT_HS_2ND_IMAGE}
rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15078):
https://lists.yoctoproject.org/g/meta-ti/message/15078
Mute This Topic: https://lists.yoctoproject.org/mt/93648963/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
