From 3c38dc0b469920b87cbd9f32d5c97c139254229c Mon Sep 17 00:00:00 2001
From: Nathan Rossi <nathan.rossi@xilinx.com>
Date: Wed, 18 Feb 2015 18:59:31 +1000
Subject: u-boot-xlnx: Split ELF deploy into seperate include file

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
---
 recipes-bsp/u-boot/u-boot-elf.inc  | 15 +++++++++++++++
 recipes-bsp/u-boot/u-boot-xlnx.inc | 16 +---------------
 2 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-elf.inc

diff --git a/recipes-bsp/u-boot/u-boot-elf.inc b/recipes-bsp/u-boot/u-boot-elf.inc
new file mode 100644
index 00000000..547a9fd3
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-elf.inc
@@ -0,0 +1,15 @@
+# U-Boot deploy ELF
+UBOOT_ELF = "u-boot"
+UBOOT_ELF_aarch64 = "u-boot.elf"
+UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
+UBOOT_ELF_BINARY ?= "u-boot.elf"
+UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
+
+do_deploy_append() {
+	if [ ! -z "${UBOOT_ELF}" ]; then
+		install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE}
+		rm -f ${DEPLOYDIR}/${UBOOT_ELF_BINARY} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
+		ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}
+		ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
+	fi
+}
diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc
index 2eac46e5..b3de0974 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -1,4 +1,5 @@
 require recipes-bsp/u-boot/u-boot.inc
+require u-boot-elf.inc
 
 LICENSE = "GPLv2+"
 
@@ -20,18 +21,3 @@ do_configure_prepend () {
 	fi
 }
 
-# U-Boot deploy ELF
-UBOOT_ELF = "u-boot"
-UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.elf"
-UBOOT_ELF_BINARY ?= "u-boot.elf"
-UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.elf"
-
-do_deploy_append() {
-	if [ ! -z "${UBOOT_ELF}" ]; then
-		install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE}
-		rm -f ${DEPLOYDIR}/${UBOOT_ELF_BINARY} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
-		ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}
-		ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}
-	fi
-}
-
-- 
cgit v1.2.3-54-g00ecf