conf: change from do_image_wic/tar to do_image_complete
PATCH v2 1/1 conf: change from do_image_wic/tar to do_image_complete
When trying to support OpenBMC, we found that our use of do_image_wic and do_image_tar for adding depends and mcdepends was too limiting. Moving to do_image_complete is a higher level in the tree that means for any image type the dependencies will be correct.
Signed-off-by Ryan Eatmon <[email protected]>
---
v2: Rebased these changes onto the latest commits, and changes to do_image_complete per Denys' suggesstion.
meta-ti-bsp/conf/machine/include/am62axx.inc | 6 +++--- meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 4 ++-- meta-ti-bsp/conf/machine/include/am62xx.inc | 6 +++--- meta-ti-bsp/conf/machine/include/am64xx.inc | 6 +++--- meta-ti-bsp/conf/machine/include/am65xx.inc | 4 ++-- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 2 +- meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-)
meta-ti-bsp/conf/machine/include/am62axx.inc +3 -3
@@ -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"
meta-ti-bsp/conf/machine/include/am62xx-lp.inc +2 -2
@@ -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"
meta-ti-bsp/conf/machine/include/am62xx.inc +3 -3
@@ -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"
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -3
@@ -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"
meta-ti-bsp/conf/machine/include/am65xx.inc +2 -2
@@ -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
meta-ti-bsp/conf/machine/include/j721e.inc +1 -1
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc +1 -1
@@ -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"
meta-ti-bsp/conf/machine/j721s2-evm.conf +2 -2
@@ -22,9 +22,9 @@ UBOOT_MACHINE = "j721s2_evm_a72_defconfig" # Default tiboot3.bin on J721S2 is 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" # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +1 -1
@@ -17,7 +17,7 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS"
meta-ti-bsp/conf/machine/j784s4-evm.conf +2 -2
@@ -20,9 +20,9 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is 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" # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +1 -1
@@ -16,7 +16,7 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" TFA_BOARD = "j784s4"
Signature · 1 line
2.17.1