[meta-xilinx] [PATCH v4 1/2] arm-trusted-firmware_git.bb: Make ATF machine independent

[Manjukumar Matha]

Make arm-trusted-firmware machine independent

Signed-off-by: Cyril Chemparathy <cyril.chemparathy at xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 conf/machine/zcu102-zynqmp.conf                           | 2 +-
 recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 72758d4..5afc85f 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -43,7 +43,7 @@ PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
 QB_OPT_APPEND_append_qemuboot-xilinx = " \
 		-hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb \
 		-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 \
-		-device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware-${MACHINE}.elf,cpu-num=0 \
+		-device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
 		-device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \
 		"
 
diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index b841fa1..4ce954f 100644
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -43,8 +43,8 @@ OUTPUT_DIR = "${B}/${PLATFORM}/release"
 
 do_deploy() {
 	install -d ${DEPLOYDIR}
-	install -m 0644 ${OUTPUT_DIR}/bl31/bl31.elf ${DEPLOYDIR}/arm-trusted-firmware-${MACHINE}.elf
-	install -m 0644 ${OUTPUT_DIR}/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware-${MACHINE}.bin
+	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
 
 	# 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')
-- 
2.7.4