[meta-xilinx] [PATCH 1/2] machine-xilinx-default.inc: Remove UBOOT_OFEMBED for UBOOT_BINARY

[Nathan Rossi]

Both u-boot-xlnx and u-boot (mainline) now agree on the name for the
output binary which includes the dtb. Additionally both versions load
'u-boot.img' from SPL. The UBOOT_OFEMBED variable and conditional value
setting are no longer needed.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 conf/machine/include/machine-xilinx-default.inc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 673944d9e0..4264d04600 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -27,11 +27,7 @@ UBOOT_SUFFIX ?= "img"
 UBOOT_SUFFIX_zynqmp ?= "bin"
 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_any('PREFERRED_PROVIDER_virtual/bootloader', 'u-boot-xlnx u-boot-xlnx-dev', '', '-dtb', d)}"
-
-UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}"
+UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 UBOOT_ELF ?= "u-boot"
 UBOOT_ELF_aarch64 ?= "u-boot.elf"
 
-- 
2.11.0