From ea3543fe98b79acb451efb8af42dfe0ddff64d63 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Fri, 26 May 2017 14:54:25 -0700 Subject: arm-trusted-firmware: deploy versioned images This patch modifies the deployed content to use versioned image names,while retaining unversioned symlinks. Signed-off-by: Cyril Chemparathy Signed-off-by: Manjukumar Matha Reviewed-by: Nathan Rossi --- recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 4ce954fb..217919cf 100644 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -15,6 +15,9 @@ B = "${WORKDIR}/build" BRANCH = "master" SRC_URI = "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https;branch=${BRANCH}" +ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}-${DATETIME}" +ATF_BASE_NAME[vardepsexclude] = "DATETIME" + COMPATIBLE_MACHINE = "zynqmp" PLATFORM_zynqmp = "zynqmp" @@ -43,13 +46,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 -- cgit v1.2.3-54-g00ecf