From 520caa9d4dcdd48fdde8585debfca56ee69f60ef Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 20 Sep 2016 23:28:38 +1000 Subject: machine-xilinx-default.inc: Set UBOOT_OFEMBED for u-boot-xlnx-dev The u-boot-xlnx-dev version of u-boot is the same as u-boot-xlnx source, it generates with OF_EMBED=y. Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-default.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 7a29bd99..59a26566 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -29,7 +29,7 @@ UBOOT_SUFFIX_microblaze ?= "bin" # 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_OFEMBED_zynq ?= "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/bootloader', 'u-boot-xlnx u-boot-xlnx-dev', '', '-dtb', d)}" UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" -- cgit v1.2.3-54-g00ecf