conf: machine: Rework do_image_wic dependencies

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e
also the bootloader. Make this clear by only depending on firmware in
the base k3.inc file, then adding the bootloader dependency in AM65x and
J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include
the bootloader nor TI-SCI firmware, only the boot partition of
the WIC file needs these.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 88259717..424864d3 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -26,17 +26,17 @@ KERNEL_DEVICETREE = " \
     ti/k3-am654-evm-ov5640.dtbo \
 "
 
-BBMULTICONFIG += "k3r5-sr2"
+# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+# Default sysfw.itb on AM65x is for SR2.0
+BBMULTICONFIG += "k3r5-sr2"
+do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-am65x"