From af1b2324c619303556c8430143be27627426342d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 17 Nov 2014 16:59:05 +1000 Subject: machine-xilinx-default.inc: Move UBOOT_SUFFIX definition Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-default.inc | 1 + recipes-bsp/u-boot/u-boot-xlnx.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 6fbb8aa3..34fe7625 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -13,6 +13,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" PREFERRED_VERSION_u-boot-xlnx ?= "v2014.01%" +UBOOT_SUFFIX ?= "img" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc index 082b72a0..2eac46e5 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -12,7 +12,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" include u-boot-extra.inc SPL_BINARY_zynq = "boot.bin" -UBOOT_SUFFIX = "img" do_configure_prepend () { if test -e ${WORKDIR}/ps7_init.h; then -- cgit v1.2.3-54-g00ecf