[meta-ti][dunfell][RFC 5/6] machine: am64xx-k3r5: The output of u-boot is not used

[Andrew Davis <afd@ti.com>]

The file tiboot3.bin produced by u-boot is not the final used
output, it should not be installed or deployed. The file with
the same name from ti-sci-fw is used. Correct this.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 conf/machine/am64xx-evm-k3r5.conf    |  7 +++++++
 conf/machine/am64xx-hs-evm-k3r5.conf |  7 +++++++
 recipes-bsp/u-boot/u-boot-ti.inc     | 10 ----------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf
index afd36b72..0835d13f 100644
--- a/conf/machine/am64xx-evm-k3r5.conf
+++ b/conf/machine/am64xx-evm-k3r5.conf
@@ -8,4 +8,11 @@ SYSFW_SOC = "am64x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 
+# SoCs that use combined image for tiboot3.bin include u-boot-spl.bin with sysfw
+# along with board configs generated by k3-image-gen and comes from ti-sci-fw
+# hence remove the legacy u-boot's tiboot3.bin and add u-boot-spl.bin instead
+UBOOT_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "spl/u-boot-spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-spl.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
index d12c030f..1b2548fd 100644
--- a/conf/machine/am64xx-hs-evm-k3r5.conf
+++ b/conf/machine/am64xx-hs-evm-k3r5.conf
@@ -9,6 +9,13 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 SYSFW_SYMLINK = ""
 
+# SoCs that use combined image for tiboot3.bin include u-boot-spl.bin with sysfw
+# along with board configs generated by k3-image-gen and comes from ti-sci-fw
+# hence remove the legacy u-boot's tiboot3.bin and add u-boot-spl.bin instead
+UBOOT_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "spl/u-boot-spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-spl.${UBOOT_SUFFIX}"
+
 UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index e7c93335..cfb57056 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -409,16 +409,6 @@ do_deploy_append_j721s2-hs-evm-k3r5 () {
 	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
 }
 
-do_deploy_append_am64xx-evm-k3r5 () {
-	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
-	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
-do_deploy_append_am64xx-hs-evm-k3r5 () {
-	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
-	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-}
-
 do_deploy_append_am62xx-evm-k3r5 () {
 	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
 	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
-- 
2.36.1