1 files changed, 13 insertions, 1 deletions

diff --git a/recipes-bsp/imx-atf/imx-atf_2.14.bb b/recipes-bsp/imx-atf/imx-atf_2.14.bb
index 407808b40..daf74d016 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.14.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.14.bb
@@ -29,6 +29,12 @@ ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.14"
 SRCREV = "af9eb2c1748ee3abc0ead7dc76e462f50c573036"
 
+# Build out of tree and from scratch: the TF-A Makefile does not track
+# build options such as SPD, so an incremental build after a
+# PACKAGECONFIG change would relink nothing and deploy a stale bl31.bin.
+B = "${WORKDIR}/build"
+do_compile[cleandirs] = "${B}"
+
 inherit deploy
 
 PACKAGECONFIG ??= "\
@@ -52,6 +58,7 @@ ATF_SYS_PWR_FULL_CTRL ?= "0"
 EXTRA_OEMAKE += "\
     CROSS_COMPILE=${TARGET_PREFIX} \
     PLAT=${ATF_PLATFORM} \
+    BUILD_BASE=${B} \
     ${PACKAGECONFIG_CONFARGS} \
     bl31 \
 "
@@ -81,6 +88,11 @@ EXTRA_OEMAKE += 'SYS_PWR_FULL_CTRL=${ATF_SYS_PWR_FULL_CTRL}'
 
 do_configure[noexec] = "1"
 
+# The Makefile is in ${S}, while the build output goes to ${B}.
+do_compile() {
+    oe_runmake -C ${S}
+}
+
 do_install[noexec] = "1"
 
 # The appends join without a leading space to build the contiguous bl31
@@ -97,7 +109,7 @@ addtask deploy after do_compile
 do_deploy() {
     OUTPUT_FOLDER="${@bb.utils.contains('PACKAGECONFIG', 'debug', 'debug', 'release', d)}"
     for deploydir in ${DEPLOYDIR} ${DEPLOYDIR}/imx-boot-tools; do
-        install -Dm 0644 ${S}/build/${ATF_PLATFORM}/${OUTPUT_FOLDER}/bl31.bin $deploydir/${ANNOTATED_NAME}
+        install -Dm 0644 ${B}/${ATF_PLATFORM}/${OUTPUT_FOLDER}/bl31.bin $deploydir/${ANNOTATED_NAME}
     done
     ln -sf ${ANNOTATED_NAME} ${DEPLOYDIR}/bl31.bin
 }