From 55e3fef745bcf898c609dbd971301db4e96d5de9 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Sat, 11 Dec 2021 10:02:21 +0000 Subject: [PATCH] arm-bsp/optee-os: corstone1000: unpack sp_manifest_combined_se.dts in WORKDIR When using devtool the S is no longer an unpack location. Let's use the default unpack location WORKDIR that works whether devtool is used or not. Change-Id: I34dfb53feddddfba82ff68a43b6cfe89a60c7701 Signed-off-by: Abdellatif El Khlifi Signed-off-by: Jon Mason --- .../recipes-security/optee/optee-os_corstone1000.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc index 8e13d507..eb5f6df0 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc @@ -14,6 +14,7 @@ SP_MKFILE_PATH += "${TS_INSTALL_PREFIX}/lib/make/smm-gateway.mk" EXTRA_OEMAKE += "'CFG_SP_MKFILE_PATH=${SP_MKFILE_PATH}'" -SRC_URI:append = " file://sp_manifest_combined_se.dts;subdir=${S}" -EMBED_DTB_SOURCE_FILE = "${S}/sp_manifest_combined_se.dts" EXTRA_OEMAKE += "CFG_EMBED_DTB_SOURCE_FILE=${EMBED_DTB_SOURCE_FILE}" + +SRC_URI:append = " file://sp_manifest_combined_se.dts;" +EMBED_DTB_SOURCE_FILE = "${WORKDIR}/sp_manifest_combined_se.dts"