summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-05-04 15:00:14 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-05-04 15:37:56 +1000
commitef86ae552e00b17d9ab6105384a2623b523cd013 (patch)
treeb799cad9d417be5331eeb2a7aa001e335aa64d47
parent85984ec1528e466a25693bc9feea311291e55d3d (diff)
downloadmeta-xilinx-ef86ae552e00b17d9ab6105384a2623b523cd013.tar.gz
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 <nathan.rossi@xilinx.com>
-rw-r--r--conf/machine/include/machine-xilinx-board.inc2
-rw-r--r--conf/machine/include/machine-xilinx-default.inc1
2 files changed, 2 insertions, 1 deletions
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 @@
2 2
3EXTRA_IMAGEDEPENDS += "virtual/bootloader" 3EXTRA_IMAGEDEPENDS += "virtual/bootloader"
4 4
5IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} u-boot.${UBOOT_SUFFIX}" 5IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}"
6 6
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%"
20 20
21UBOOT_SUFFIX ?= "img" 21UBOOT_SUFFIX ?= "img"
22UBOOT_SUFFIX_zynqmp ?= "bin" 22UBOOT_SUFFIX_zynqmp ?= "bin"
23UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
23UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}" 24UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}"
24 25
25# Device Trees 26# Device Trees