diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-01-04 13:58:43 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-01-16 14:38:05 +0000 |
| commit | f3aa84bcc9568e4d6d0a876d7772cc84ca3736de (patch) | |
| tree | 6cf90c12bd44c6276862372a6c156de8526c0b17 | |
| parent | b69121821c3a3e4cc9ede9607edd5a2e11389a97 (diff) | |
build-arm-tf.sh: use SPD=optee only on Junoarmlt-20170116-001armlt-17.0117.01
Building wth SPD=opteed tells ARM-TF that there is a BL32. However, we
weren't supplying a BL32 for FVP, only for Juno: OPTEE is disabled on
FVP.
Sine a recent ARM-TF commit, FVP hangs on boot when expecting to use
BL32.
To fix this problem, only set SPD=opteed for Juno builds.
Change-Id: I857fcb30d5a3c9c1bc0a592712ca0dd5dac8bcb3
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | build-arm-tf.sh | 2 | ||||
| -rw-r--r-- | platforms/juno/juno | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build-arm-tf.sh b/build-arm-tf.sh index 5d8a036..8ae185f 100755 --- a/build-arm-tf.sh +++ b/build-arm-tf.sh @@ -60,7 +60,7 @@ do_build () fi if [ "${!atf_optee_enabled}" == "1" ]; then #if optee enabled, set corresponding compiliation flags - atf_build_flags="${atf_build_flags} ARM_TSP_RAM_LOCATION=$OPTEE_RAM_LOCATION SPD=opteed" + atf_build_flags="${atf_build_flags} ARM_TSP_RAM_LOCATION=$OPTEE_RAM_LOCATION" fi make -j $PARALLELISM PLAT=$plat ARCH=$ARM_TF_ARCH DEBUG=$ARM_TF_DEBUG_ENABLED ${atf_build_flags} all done diff --git a/platforms/juno/juno b/platforms/juno/juno index 4c392af..ec6d763 100644 --- a/platforms/juno/juno +++ b/platforms/juno/juno @@ -52,6 +52,7 @@ TBBR_juno[tbbr]=1 OPTEE_BUILD_ENABLED=1 OPTEE_FLAVOUR="juno" +ARM_TF_BUILD_FLAGS="SPD=opteed" ANDROID_BINS_VARIANTS="juno" |