7 files changed, 15 insertions, 15 deletions
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index d0970948..434b2a0f 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -10,17 +10,17 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 # Default tiboot3.bin on AM62A is for HS-FS
 BBMULTICONFIG = "k3r5-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
 IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
 BBMULTICONFIG += "k3r5-hs-se"
 IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
index d37d4673..ad5cf997 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -10,12 +10,12 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 # Default tiboot3.bin on AM62x LP is for HS-FS
 BBMULTICONFIG = "k3r5-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
 # Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
 BBMULTICONFIG += "k3r5-hs-se"
 IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index af6a6db4..de180127 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -10,17 +10,17 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 # Default tiboot3.bin on AM62x is for HS-FS
 BBMULTICONFIG = "k3r5-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
 IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
 BBMULTICONFIG += "k3r5-hs-se"
 IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 157bf5d5..bff0de1f 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -13,17 +13,17 @@ KERNEL_DEVICETREE = " \
 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
 BBMULTICONFIG = "k3r5-sr2-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
 BBMULTICONFIG += "k3r5-sr2-hs-se"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 TFA_BOARD = "lite"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 564d61b0..edfc7c11 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -15,11 +15,11 @@ KERNEL_DEVICETREE = " \
 "
 # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 # Default sysfw.itb on AM65x is for SR2.0
 BBMULTICONFIG += "k3r5-sr2"
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
+do_image_complete[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
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 8f9c24e6..5e325ffe 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 IMAGE_BOOT_FILES += "sysfw.itb"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 93bcea76..94c0e7e3 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -52,4 +52,4 @@ MACHINE_FEATURES += "efi"
 WKS_FILE ?= "sdimage-2part-efi.wks"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"

diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index d0970948..434b2a0f 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -10,17 +10,17 @@ TFA_K3_SYSTEM_SUSPEND = "1"
10		10
11	# Default tiboot3.bin on AM62A is for HS-FS	11	# Default tiboot3.bin on AM62A is for HS-FS
12	BBMULTICONFIG = "k3r5-hs-fs"	12	BBMULTICONFIG = "k3r5-hs-fs"
13	do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"	13	do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
14		14
15	# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP	15	# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
16	BBMULTICONFIG += "k3r5-gp"	16	BBMULTICONFIG += "k3r5-gp"
17	IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"	17	IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
18	do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"	18	do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
19		19
20	# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE	20	# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
21	BBMULTICONFIG += "k3r5-hs-se"	21	BBMULTICONFIG += "k3r5-hs-se"
22	IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"	22	IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
23	do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"	23	do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
24		24
25	TFA_BOARD = "lite"	25	TFA_BOARD = "lite"
26	OPTEEMACHINE = "k3-am62x"	26	OPTEEMACHINE = "k3-am62x"


diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index d37d4673..ad5cf997 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -10,12 +10,12 @@ TFA_K3_SYSTEM_SUSPEND = "1"
10		10
11	# Default tiboot3.bin on AM62x LP is for HS-FS	11	# Default tiboot3.bin on AM62x LP is for HS-FS
12	BBMULTICONFIG = "k3r5-hs-fs"	12	BBMULTICONFIG = "k3r5-hs-fs"
13	do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"	13	do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
14		14
15	# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE	15	# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
16	BBMULTICONFIG += "k3r5-hs-se"	16	BBMULTICONFIG += "k3r5-hs-se"
17	IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"	17	IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
18	do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"	18	do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
19		19
20	TFA_BOARD = "lite"	20	TFA_BOARD = "lite"
21	OPTEEMACHINE = "k3-am62x"	21	OPTEEMACHINE = "k3-am62x"


diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index af6a6db4..de180127 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -10,17 +10,17 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
10		10
11	# Default tiboot3.bin on AM62x is for HS-FS	11	# Default tiboot3.bin on AM62x is for HS-FS
12	BBMULTICONFIG = "k3r5-hs-fs"	12	BBMULTICONFIG = "k3r5-hs-fs"
13	do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"	13	do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
14		14
15	# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP	15	# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
16	BBMULTICONFIG += "k3r5-gp"	16	BBMULTICONFIG += "k3r5-gp"
17	IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"	17	IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
18	do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"	18	do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
19		19
20	# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE	20	# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
21	BBMULTICONFIG += "k3r5-hs-se"	21	BBMULTICONFIG += "k3r5-hs-se"
22	IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"	22	IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
23	do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"	23	do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
24		24
25	TFA_BOARD = "lite"	25	TFA_BOARD = "lite"
26	TFA_K3_SYSTEM_SUSPEND = "1"	26	TFA_K3_SYSTEM_SUSPEND = "1"


diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 157bf5d5..bff0de1f 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -13,17 +13,17 @@ KERNEL_DEVICETREE = " \
13		13
14	# Default tiboot3.bin on AM64x is for SR2.0 HS-FS	14	# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
15	BBMULTICONFIG = "k3r5-sr2-hs-fs"	15	BBMULTICONFIG = "k3r5-sr2-hs-fs"
16	do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"	16	do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
17	IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"	17	IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
18		18
19	# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP	19	# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
20	BBMULTICONFIG += "k3r5-gp"	20	BBMULTICONFIG += "k3r5-gp"
21	do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"	21	do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
22	IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"	22	IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
23		23
24	# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE	24	# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
25	BBMULTICONFIG += "k3r5-sr2-hs-se"	25	BBMULTICONFIG += "k3r5-sr2-hs-se"
26	do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"	26	do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
27	IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"	27	IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
28		28
29	TFA_BOARD = "lite"	29	TFA_BOARD = "lite"


diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 564d61b0..edfc7c11 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -15,11 +15,11 @@ KERNEL_DEVICETREE = " \
15	"	15	"
16		16
17	# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw	17	# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
18	do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"	18	do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
19		19
20	# Default sysfw.itb on AM65x is for SR2.0	20	# Default sysfw.itb on AM65x is for SR2.0
21	BBMULTICONFIG += "k3r5-sr2"	21	BBMULTICONFIG += "k3r5-sr2"
22	do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"	22	do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
23	IMAGE_BOOT_FILES += "sysfw.itb"	23	IMAGE_BOOT_FILES += "sysfw.itb"
24		24
25	# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0	25	# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0


diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 8f9c24e6..5e325ffe 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
6	PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"	6	PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
7		7
8	# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw	8	# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
9	do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"	9	do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
10		10
11	IMAGE_BOOT_FILES += "sysfw.itb"	11	IMAGE_BOOT_FILES += "sysfw.itb"
12		12


diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 93bcea76..94c0e7e3 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -52,4 +52,4 @@ MACHINE_FEATURES += "efi"
52		52
53	WKS_FILE ?= "sdimage-2part-efi.wks"	53	WKS_FILE ?= "sdimage-2part-efi.wks"
54	do_image_wic[depends] += "virtual/bootloader:do_deploy"	54	do_image_wic[depends] += "virtual/bootloader:do_deploy"
55	do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"	55	do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"