From a1b4450140d04073a99bf263c50b66de2563512f Mon Sep 17 00:00:00 2001 From: Jaewon Lee Date: Tue, 20 Aug 2019 14:36:05 -0700 Subject: machine-xilinx-default.inc: Adding required dependencies to image_wic Adding base required dependencies to do_image_wic[depends] to make sure the common files required to boot.bin have been deployed in DEPLOYDIR before the do_image_wic task tries to use them. zynqmp/versal will add virtual/kernel, virtual/boot-bin, virtual/bootloader, and virtual/arm-trusted-firmware zynq will add everything but virtual/arm-trusted-firmware If you want to add other files to IMAGE_BOOT_FILES, aside from files deployed from virtual/kernel, virtual/boot-bin, virtual/bootloader, you may need to manually add the dependency to do_image_wic[depends] Signed-off-by: Jaewon Lee Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc index 870011cc..c8cdb0c2 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -17,6 +17,10 @@ XILINX_DEFAULT_UBOOT_zynqmp := "u-boot" PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader}" +WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware" +WIC_DEPENDS_zynq = "virtual/kernel virtual/bootloader virtual/boot-bin" +do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in d.getVar('WIC_DEPENDS').split())}" + UBOOT_SUFFIX ?= "img" UBOOT_SUFFIX_zynqmp ?= "bin" UBOOT_SUFFIX_microblaze ?= "bin" -- cgit v1.2.3-54-g00ecf