[meta-xilinx] [PATCH v2 4/4] arm-trusted-firmware: deploy versioned images

[Manjukumar Matha]

From: Cyril Chemparathy <cyril.chemparathy at xilinx.com>

This patch modifies the deployed content to use versioned image names,
while retaining unversioned symlinks.

Signed-off-by: Cyril Chemparathy <cyril.chemparathy at xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
index 0cd34d4..e59ce2a 100644
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb
@@ -23,6 +23,9 @@ XILINX_RELEASE_VERSION = "v2017.1"
 
 PV = "1.3-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
+ATF_BASE_NAME ?= "${PN}${PKGE}-${PKGV}-${PKGR}-${DATETIME}"
+ATF_BASE_NAME[vardepsexclude] = "DATETIME"
+
 COMPATIBLE_MACHINE = "zynqmp"
 PLATFORM_zynqmp = "zynqmp"
 
@@ -51,13 +54,16 @@ OUTPUT_DIR = "${B}/${PLATFORM}/release"
 
 do_deploy() {
 	install -d ${DEPLOYDIR}
-	install -m 0644 ${OUTPUT_DIR}/bl31/bl31.elf ${DEPLOYDIR}/arm-trusted-firmware.elf
-	install -m 0644 ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware.bin
+	install -m 0644 ${OUTPUT_DIR}/bl31/bl31.elf ${DEPLOYDIR}/${ATF_BASE_NAME}.elf
+	ln -sf ${ATF_BASE_NAME}.elf ${DEPLOYDIR}/${PN}.elf
+	install -m 0644 ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/${ATF_BASE_NAME}.bin
+	ln -sf ${ATF_BASE_NAME}.bin ${DEPLOYDIR}/${PN}.bin
 
 	# Get the entry point address from the elf.
 	BL31_BASE_ADDR=$(${READELF} -h ${OUTPUT_DIR}/bl31/bl31.elf | egrep -m 1 -i "entry point.*?0x" | sed -r 's/.*?(0x.*?)/\1/g')
 	mkimage -A arm64 -O linux -T kernel -C none \
 		-a $BL31_BASE_ADDR -e $BL31_BASE_ADDR \
-		-d ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware.ub
+		-d ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/${ATF_BASE_NAME}.ub
+	ln -sf ${ATF_BASE_NAME}.ub ${DEPLOYDIR}/${PN}.ub
 }
 addtask deploy before do_build after do_compile
-- 
2.7.4