From ef86ae552e00b17d9ab6105384a2623b523cd013 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 4 May 2015 15:00:14 +1000 Subject: machine-xilinx-board.inc: Fixup value for u-boot image file * Default the value of UBOOT_BINARY in machine-xilinx-default.inc so that machine-xilinx-board.inc can use the variable to define the file name of the u-boot image Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-board.inc | 2 +- conf/machine/include/machine-xilinx-default.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc index 8818b24b..ba9a36be 100644 --- a/conf/machine/include/machine-xilinx-board.inc +++ b/conf/machine/include/machine-xilinx-board.inc @@ -2,5 +2,5 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" -IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} u-boot.${UBOOT_SUFFIX}" +IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index cc03747e..43ef4096 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -20,6 +20,7 @@ PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%" UBOOT_SUFFIX ?= "img" UBOOT_SUFFIX_zynqmp ?= "bin" +UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}" # Device Trees -- cgit v1.2.3-54-g00ecf