When multiple U-Boot configurations are used via UBOOT_CONFIG, the UBOOT_MACHINE variable might contain several strings separated by whitespaces. This results in an additional dependency on virtual/xilinx-platform-init, even if HAS_PLATFORM_INIT is set. Fix this by looping over all configurations in UBOOT_MACHINE.
Signed-off-by: Benedikt Grassl <[email protected]> --- .../recipes-bsp/u-boot/u-boot-spl-zynq-init.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc index cf8b9b7..37edfb7 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc @@ -41,14 +41,15 @@ python () { # Determine if target machine needs to provide a custom platform init files if d.getVar("SPL_BINARY"): hasconfigs = [strip_config_name(c) for c in (d.getVar("HAS_PLATFORM_INIT") or "").split()] - currentconfig = strip_config_name(d.getVar("UBOOT_MACHINE")) + currentconfigs = [strip_config_name(c) for c in (d.getVar("UBOOT_MACHINE") or "").split()] # only add the dependency if u-boot doesn't already provide the platform init files - if (currentconfig not in hasconfigs) or (d.getVar("FORCE_PLATFORM_INIT") == "1"): - # force the dependency on a recipe that provides the platform init files - d.appendVar("DEPENDS", " virtual/xilinx-platform-init") - # setup task to modify platform init after unpack and prepare_recipe_sysroot, and before configure - bb.build.addtask("do_zynq_platform_init", "do_configure", "do_unpack do_prepare_recipe_sysroot", d) + for c in currentconfigs: + if (c not in hasconfigs) or (d.getVar("FORCE_PLATFORM_INIT") == "1"): + # force the dependency on a recipe that provides the platform init files + d.appendVar("DEPENDS", " virtual/xilinx-platform-init") + # setup task to modify platform init after unpack and prepare_recipe_sysroot, and before configure + bb.build.addtask("do_zynq_platform_init", "do_configure", "do_unpack do_prepare_recipe_sysroot", d) if "boot.bin" not in d.getVar("SPL_BINARY"): # not deploying the boot.bin, just building SPL -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#4664): https://lists.yoctoproject.org/g/meta-xilinx/message/4664 Mute This Topic: https://lists.yoctoproject.org/mt/71167649/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
