From 5f0cc3cc149f6073f00f43c81db22aa695ebb325 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Sat, 11 Feb 2017 21:47:26 +1000 Subject: machine-xilinx-default.inc: Remove UBOOT_OFEMBED for UBOOT_BINARY 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 --- 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 673944d9..4264d046 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" -- cgit v1.2.3-54-g00ecf