Skip to contentSkip to conversation

conf: change from do_image_wic/tar to do_image

PATCH Superseded Ryan Eatmon 2 participants 5 messages Dec 11, 2022 – Dec 20, 2022 1 message not in the archive

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf: change from do_image_wic/tar to do_image

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 is a higher level in the tree that means for any image type the dependencies will be correct.

---
 meta-ti-bsp/conf/machine/include/am62xx.inc   | 3 +--
 meta-ti-bsp/conf/machine/include/am64xx.inc   | 9 +++------
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 3 +--
 meta-ti-bsp/conf/machine/include/k3.inc       | 5 ++---
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 2 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 2 +-
 meta-ti-bsp/conf/machine/j7200-evm.conf       | 3 +--
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf    | 3 +--
 meta-ti-bsp/conf/machine/j721s2-evm.conf      | 3 +--
 meta-ti-bsp/conf/machine/j784s4-evm.conf      | 3 +--
 11 files changed, 14 insertions(+), 24 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -2
index a5aad994..3b6e5b4d 100644
@@ -12,8 +12,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -6
index 055f6036..2fca1ac0 100644
@@ -16,20 +16,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_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
 IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 
 # 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"
 IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +1 -2
index 80aa6d27..ef31ea52 100644
@@ -34,8 +34,7 @@ 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"
+do_image[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/k3.inc +2 -3
index 84afd2e2..e11b71b1 100644
@@ -47,8 +47,7 @@ EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "sdimage-2part-efi.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..08f9d448 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/include/ti33x.inc +1 -1
index cfacc30d..d9381555 100644
@@ -60,4 +60,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..ab57216f 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +1 -2
index 303ec182..077d2f41 100644
@@ -13,5 +13,4 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +1 -2
index 9ef7b86a..2eced539 100644
@@ -23,5 +23,4 @@ BBMULTICONFIG += "k3r5-sr1-1"
 
 # Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +1 -2
index 37353df4..d02c8258 100644
@@ -17,5 +17,4 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +1 -2
index 96acca13..f88006c3 100644
@@ -18,8 +18,7 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "j784s4"
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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 is a higher level in the tree that means for any image type the dependencies will be correct.

There might be some unexpected side effects, since do_image is too broard. Not every image has a boot partition and should depend on the corresponding boot files being deployed. Things like ramdisks, initramfs and such have different flows and own dependencies. Also images that include other images, like guests for VMs or hypervisors or even bootstrapping. All those could potentially have issues due to a global do_image dependency - I've seen circular dependency breakages in the past in those areas. Not all use cases are being tested by default, so not easy to tell if this change is compltetely harmless...

Quoted 165 lines
---
 meta-ti-bsp/conf/machine/include/am62xx.inc   | 3 +--
 meta-ti-bsp/conf/machine/include/am64xx.inc   | 9 +++------
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 3 +--
 meta-ti-bsp/conf/machine/include/k3.inc       | 5 ++---
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 2 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 2 +-
 meta-ti-bsp/conf/machine/j7200-evm.conf       | 3 +--
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf    | 3 +--
 meta-ti-bsp/conf/machine/j721s2-evm.conf      | 3 +--
 meta-ti-bsp/conf/machine/j784s4-evm.conf      | 3 +--
 11 files changed, 14 insertions(+), 24 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -2
index a5aad994..3b6e5b4d 100644
@@ -12,8 +12,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -6
index 055f6036..2fca1ac0 100644
@@ -16,20 +16,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_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
 IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 
 # 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"
 IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +1 -2
index 80aa6d27..ef31ea52 100644
@@ -34,8 +34,7 @@ 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"
+do_image[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/k3.inc +2 -3
index 84afd2e2..e11b71b1 100644
@@ -47,8 +47,7 @@ EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "sdimage-2part-efi.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..08f9d448 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/include/ti33x.inc +1 -1
index cfacc30d..d9381555 100644
@@ -60,4 +60,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..ab57216f 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +1 -2
index 303ec182..077d2f41 100644
@@ -13,5 +13,4 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +1 -2
index 9ef7b86a..2eced539 100644
@@ -23,5 +23,4 @@ BBMULTICONFIG += "k3r5-sr1-1"
 
 # Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +1 -2
index 37353df4..d02c8258 100644
@@ -17,5 +17,4 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +1 -2
index 96acca13..f88006c3 100644
@@ -18,8 +18,7 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "j784s4"
 
Signature · 1 line
2.17.1
#2 lore raw
Quoted 6 lines · Denys Dmytriyenko
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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 is a higher level in the tree that means for any image type the dependencies will be correct.

Quoted 8 lines

There might be some unexpected side effects, since do_image is too broard. Not every image has a boot partition and should depend on the corresponding boot files being deployed. Things like ramdisks, initramfs and such have different flows and own dependencies. Also images that include other images, like guests for VMs or hypervisors or even bootstrapping. All those could potentially have issues due to a global do_image dependency - I've seen circular dependency breakages in the past in those areas. Not all use cases are being tested by default, so not easy to tell if this change is compltetely harmless...

I was worried something like that might be true. But how are we supposed to know which images (present and future) that we need to add dependencies for in this case?

Quoted 166 lines
Quoted 166 lines
---
  meta-ti-bsp/conf/machine/include/am62xx.inc   | 3 +--
  meta-ti-bsp/conf/machine/include/am64xx.inc   | 9 +++------
  meta-ti-bsp/conf/machine/include/am65xx.inc   | 3 +--
  meta-ti-bsp/conf/machine/include/k3.inc       | 5 ++---
  meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
  meta-ti-bsp/conf/machine/include/ti33x.inc    | 2 +-
  meta-ti-bsp/conf/machine/include/ti43x.inc    | 2 +-
  meta-ti-bsp/conf/machine/j7200-evm.conf       | 3 +--
  meta-ti-bsp/conf/machine/j721e-hs-evm.conf    | 3 +--
  meta-ti-bsp/conf/machine/j721s2-evm.conf      | 3 +--
  meta-ti-bsp/conf/machine/j784s4-evm.conf      | 3 +--
  11 files changed, 14 insertions(+), 24 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -2
index a5aad994..3b6e5b4d 100644
@@ -12,8 +12,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
  TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -6
index 055f6036..2fca1ac0 100644
@@ -16,20 +16,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_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
 
  # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
  BBMULTICONFIG += "k3r5-gp"
  IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
 
  # 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"
  IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
  TFA_BOARD = "lite"
  OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +1 -2
index 80aa6d27..ef31ea52 100644
@@ -34,8 +34,7 @@ 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"
+do_image[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
  OPTEEMACHINE = "k3-am65x"
  OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/k3.inc +2 -3
index 84afd2e2..e11b71b1 100644
@@ -47,8 +47,7 @@ EFI_PROVIDER ?= "grub-efi"
  MACHINE_FEATURES += "efi"
 
  WKS_FILE ?= "sdimage-2part-efi.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
 
  TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..08f9d448 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
  IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
  WKS_FILE ?= "sdimage-2part.wks"
  IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/include/ti33x.inc +1 -1
index cfacc30d..d9381555 100644
@@ -60,4 +60,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
  IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
  WKS_FILE ?= "sdimage-2part.wks"
  IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..ab57216f 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
  IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
  WKS_FILE ?= "sdimage-2part.wks"
  IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image[depends] += "u-boot:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +1 -2
index 303ec182..077d2f41 100644
@@ -13,5 +13,4 @@ KERNEL_DEVICETREE = " \
 
  UBOOT_MACHINE = "j7200_evm_a72_config"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +1 -2
index 9ef7b86a..2eced539 100644
@@ -23,5 +23,4 @@ BBMULTICONFIG += "k3r5-sr1-1"
 
  # Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
  IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+do_image[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +1 -2
index 37353df4..d02c8258 100644
@@ -17,5 +17,4 @@ KERNEL_DEVICETREE = " \
 
  UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +1 -2
index 96acca13..f88006c3 100644
@@ -18,8 +18,7 @@ KERNEL_DEVICETREE = " \
 
  UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
  TFA_BOARD = "j784s4"
 
Signature · 1 line
2.17.1
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#3 lore raw
Quoted 18 lines · Ryan Eatmon
Quoted 6 lines · Denys Dmytriyenko
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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 is a higher level in the tree that means for any image type the dependencies will be correct.

Quoted 8 lines

There might be some unexpected side effects, since do_image is too broard. Not every image has a boot partition and should depend on the corresponding boot files being deployed. Things like ramdisks, initramfs and such have different flows and own dependencies. Also images that include other images, like guests for VMs or hypervisors or even bootstrapping. All those could potentially have issues due to a global do_image dependency - I've seen circular dependency breakages in the past in those areas. Not all use cases are being tested by default, so not easy to tell if this change is compltetely harmless...

Quoted 3 lines

I was worried something like that might be true. But how are we supposed to know which images (present and future) that we need to add dependencies for in this case?

Yeah, that's a very good question. My thinking back then was that usually we only want "wic" format for a bootable whole-system images, hence I limited the dependency to do_image_wic (and the tar version was a by-product). Maybe your change is not as dangerous as I was imagining :) - definitely needs more thorough testing. Or we can come up with a completely different way of specifying those dependencies?

Signature · 1 line
Denys

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 23 lines · Denys Dmytriyenko
Quoted 18 lines · Ryan Eatmon
Quoted 6 lines · Denys Dmytriyenko
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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 is a higher level in the tree that means for any image type the dependencies will be correct.

Quoted 8 lines

There might be some unexpected side effects, since do_image is too broard. Not every image has a boot partition and should depend on the corresponding boot files being deployed. Things like ramdisks, initramfs and such have different flows and own dependencies. Also images that include other images, like guests for VMs or hypervisors or even bootstrapping. All those could potentially have issues due to a global do_image dependency - I've seen circular dependency breakages in the past in those areas. Not all use cases are being tested by default, so not easy to tell if this change is compltetely harmless...

Quoted 3 lines

I was worried something like that might be true. But how are we supposed to know which images (present and future) that we need to add dependencies for in this case?

Quoted 6 lines

Yeah, that's a very good question. My thinking back then was that usually we only want "wic" format for a bootable whole-system images, hence I limited the dependency to do_image_wic (and the tar version was a by-product). Maybe your change is not as dangerous as I was imagining :) - definitely needs more thorough testing. Or we can come up with a completely different way of specifying those dependencies?

Ryan,

After some digging and experimenting locally, I believe we can move towards using do_image_complete[mcdepends] for the required dependencies. It's further down the chain from do_image and before do_image_wic, so should be a bit safer in my opinion... I've done few builds with this change, but would you be able to run it through the full set of builds on the farm? Thanks.

Signature · 1 line
Denys