diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-11-17 16:59:05 +1000 |
---|---|---|
committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-11-17 16:59:05 +1000 |
commit | af1b2324c619303556c8430143be27627426342d (patch) | |
tree | 340c521a984c4f2f7b03fdb3fbea6d62f2223df3 | |
parent | 892baf45f992e93596fdb135dd107a6d8b48fa27 (diff) | |
download | meta-xilinx-af1b2324c619303556c8430143be27627426342d.tar.gz |
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.inc | 1 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx.inc | 1 |
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%" | |||
13 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" | 13 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" |
14 | PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" | 14 | PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" |
15 | PREFERRED_VERSION_u-boot-xlnx ?= "v2014.01%" | 15 | PREFERRED_VERSION_u-boot-xlnx ?= "v2014.01%" |
16 | UBOOT_SUFFIX ?= "img" | ||
16 | 17 | ||
17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | 18 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" |
18 | 19 | ||
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}" | |||
12 | include u-boot-extra.inc | 12 | include u-boot-extra.inc |
13 | 13 | ||
14 | SPL_BINARY_zynq = "boot.bin" | 14 | SPL_BINARY_zynq = "boot.bin" |
15 | UBOOT_SUFFIX = "img" | ||
16 | 15 | ||
17 | do_configure_prepend () { | 16 | do_configure_prepend () { |
18 | if test -e ${WORKDIR}/ps7_init.h; then | 17 | if test -e ${WORKDIR}/ps7_init.h; then |