From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 15 May 2020 04:56:41 +0000 (+0800)
Subject: atf: fix build failure due to optee binary not exist
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f3148122d6883d722c1ce34fc92d7f8908f492f5;p=meta-freescale.git

atf: fix build failure due to optee binary not exist

When optee enabled in DISTRO_FEATURES, optee-os-qoriq is added as
DEPENDS, and atf tries to find optee binary under ${DEPLOY_DIR_IMAGE}.
This has issue when do_deploy task of optee-os-qoriq does not run
before atf's do_compile.

Switch to find optee binary under ${RECIPE_SYSROOT} instead of
${DEPLOY_DIR_IMAGE}.

Steps to reproduce the issue:
$ echo 'DISTRO_FEATURES_append = " optee"' >>conf/local.conf
$ bitbake -c cleansstate atf optee-os-qoriq
$ bitbake -c install optee-os-qoriq
$ bitbake -c compile atf
| Building lx2160ardb
| Makefile:633: *** 'BL32=.../tmp/deploy/images/lx2160ardb/optee/tee_lx2160ardb.bin'
| was specified, but '.../tmp/deploy/images/lx2160ardb/optee/tee_lx2160ardb.bin'
| does not exist.  Stop.
| make: *** Waiting for unfinished jobs....

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---

diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb
index 695a4518..7b8e4c9f 100644
--- a/recipes-bsp/atf/atf_git.bb
+++ b/recipes-bsp/atf/atf_git.bb
@@ -101,7 +101,7 @@ do_compile() {
     fi       
 
     if [ "${BUILD_OPTEE}" = "true" ]; then
-        bl32="${DEPLOY_DIR_IMAGE}/optee/tee_${MACHINE}.bin" 
+        bl32="${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin" 
         bl32opt="BL32=${bl32}"
         spdopt="SPD=opteed" 
     fi