aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-11-17 16:59:05 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-11-17 16:59:05 +1000
commitaf1b2324c619303556c8430143be27627426342d (patch)
tree340c521a984c4f2f7b03fdb3fbea6d62f2223df3
parent892baf45f992e93596fdb135dd107a6d8b48fa27 (diff)
downloadmeta-xilinx-af1b2324c619303556c8430143be27627426342d.tar.gz
meta-xilinx-af1b2324c619303556c8430143be27627426342d.tar.bz2
meta-xilinx-af1b2324c619303556c8430143be27627426342d.zip
machine-xilinx-default.inc: Move UBOOT_SUFFIX definition
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--conf/machine/include/machine-xilinx-default.inc1
-rw-r--r--recipes-bsp/u-boot/u-boot-xlnx.inc1
2 files changed, 1 insertions, 1 deletions
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