From 4d68c84dfc424bfe897730315b1916874cb447ea Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Thu, 19 Aug 2021 13:14:30 +0200
Subject: [PATCH] u-boot: fix name of deployed artifacts

And also reduce the number of created artifacts and simplify do_deploy.
The rm commands are not required. bitbake is smart enough to remove the
old deployed artifacts of a recipe.

BugzID: 74357

Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>
---
 recipes-bsp/u-boot/u-boot-armada_git.bb | 11 ++++-------
 recipes-bsp/u-boot/u-boot-ti33x_git.bb  | 12 +++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-armada_git.bb b/recipes-bsp/u-boot/u-boot-armada_git.bb
index 492a76d..29eb6f1 100644
--- a/recipes-bsp/u-boot/u-boot-armada_git.bb
+++ b/recipes-bsp/u-boot/u-boot-armada_git.bb
@@ -14,12 +14,9 @@ PV = "v2017.11+git${SRCPV}"
 UBOOT_SUFFIX = "kwb"
 UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
 
-do_deploy_append() {
-    rm -f ${DEPLOYDIR}/${PN}-spl.bin
-    rm -f ${DEPLOYDIR}/${PN}.bin
-    rm -f ${DEPLOYDIR}/${PN}-spl.kwb
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
-    cp ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
+do_deploy() {
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-u-boot-${MACHINE}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/u-boot-${MACHINE}.xmodem.bin
+    cp ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/u-boot-${MACHINE}.${UBOOT_SUFFIX}
 }
 
diff --git a/recipes-bsp/u-boot/u-boot-ti33x_git.bb b/recipes-bsp/u-boot/u-boot-ti33x_git.bb
index 8b17003..7e7447e 100644
--- a/recipes-bsp/u-boot/u-boot-ti33x_git.bb
+++ b/recipes-bsp/u-boot/u-boot-ti33x_git.bb
@@ -10,11 +10,9 @@ PV = "v2016.05+git${SRCPV}"
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
 
-do_deploy_append() {
-    rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
-    rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
-    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
-    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
+do_deploy() {
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-u-boot-${MACHINE}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/u-boot-${MACHINE}.xmodem.bin
+    cp ${S}/MLO ${DEPLOYDIR}/spl-u-boot-${MACHINE}.${UBOOT_SUFFIX}
+    cp ${S}/u-boot.img ${DEPLOYDIR}/u-boot-${MACHINE}.${UBOOT_SUFFIX}
 }