From 1ec9540091c6d2cb7faf679f3b01916bfb0a0397 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Mon, 13 Jun 2022 09:10:45 +0000 Subject: recipes-bsp: drop custom deploy location for TF-A binary Upstream TF-A and downstream TF-A fork uses different deployment locations for results binaries, which leads to failures during image build when switching between upstream and downstream versions. Drop the custom TF-A deployment location, which is only specific to NXP downstream deployment, allowing the TF-A binaries from upstream and downstream to be picked up from the same location, namely - image deployment folder. Signed-off-by: Andrey Zhizhikin --- classes/imx-boot-container.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/imx-boot-container.bbclass') diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 7765266db..711bbd9e5 100644 --- a/classes/imx-boot-container.bbclass +++ b/classes/imx-boot-container.bbclass @@ -47,7 +47,7 @@ do_resolve_and_populate_binaries() { cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${B}/${config}/ done if [ -n "${ATF_MACHINE_NAME}" ]; then - cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin + cp ${DEPLOY_DIR_IMAGE}/${ATF_MACHINE_NAME} ${B}/${config}/bl31.bin else bberror "ATF binary is undefined, result binary would be unusable!" fi -- cgit v1.2.3-54-g00ecf