u-boot-xlnx: Use 'u-boot-dtb.img' for Zynq

* 'u-boot-dtb.img' is the name of the Payload that U-Boot SPL expects
  for Zynq
* Prepare for compatibility for future versions where Zynq will use
  U-Boot DTBs

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

2 files changed, 11 insertions, 0 deletions

diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 86b01001..1ff73426 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -13,8 +13,11 @@ 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 ?= "v2015.01%"
+
 UBOOT_SUFFIX ?= "img"
+UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}"
 
+# Device Trees
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
 # Common Device Tree Includes
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb b/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb
index adcb39d7..f9d7a7a5 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb
@@ -13,3 +13,11 @@ UBOOT_ENV_zedboard-zynq7 = "uEnv"
 
 SRC_URI_append_zc702-zynq7 += "file://uEnv.txt"
 SRC_URI_append_zedboard-zynq7 += "file://uEnv.txt"
+
+do_compile_append() {
+    # link u-boot-dtb.img to u-boot.img.
+    if [ ! -e ${B}/u-boot-dtb.img ]; then
+        ln -sf u-boot.img ${B}/u-boot-dtb.img
+    fi
+}
+