Handle the case where mainline u-boot does not default to having the target device tree embedded into the u-boot ELF via OF_EMBED, which is default for the u-boot-xlnx source tree. Select the UBOOT_BINARY value based on the currently configured virtual/bootloader provider.
Signed-off-by: Nathan Rossi <[email protected]> --- conf/machine/include/machine-xilinx-default.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index ec581c0..f8dc362 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -22,7 +22,12 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" UBOOT_SUFFIX ?= "img" UBOOT_SUFFIX_zynqmp ?= "bin" -UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" + +# u-boot-xlnx setups up all zynq configs to have embedded device trees (OF_EMBED=y) +UBOOT_OFEMBED ?= "" +UBOOT_OFEMBED_zynq ?= "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/bootloader', 'u-boot-xlnx', '', '-dtb', d)}" + +UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" UBOOT_ELF_aarch64 ?= "u-boot.elf" -- 2.7.0 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
