Merge branch 'master' into nrossi/layer-refactor

1 files changed, 7 insertions, 3 deletions

diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc
index 329a7754..79808a37 100644
--- a/recipes-bsp/u-boot/u-boot-extra.inc
+++ b/recipes-bsp/u-boot/u-boot-extra.inc
@@ -1,8 +1,12 @@
 
+S = "${WORKDIR}/git"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # Also deploy u-boot elf file with same file format as bin file
+UBOOTXTENSION ?= "${XILINX_EXTENSION}-${MACHINE}"
 SRC_ELF ?= "u-boot"
-DEST_ELF ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
-ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
+DEST_ELF ?= "u-boot${UBOOTXTENSION}-${PV}-${PR}.elf"
+ELF_SYMLINK ?= "u-boot${UBOOTXTENSION}.elf"
 do_deploy_append() {
         install ${S}/${SRC_ELF} ${DEPLOYDIR}/${DEST_ELF}
 
@@ -40,4 +44,4 @@ do_configure_prepend () {
                         echo "CONFIG_SYS_TEXT_BASE = $BASE_OFFSET" >> ${CONFIG_MK}
                 fi
         fi
-}
\ No newline at end of file
+}