diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-02-23 17:19:35 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-04-06 18:01:58 +0100 |
| commit | 6e67b3189c3f434de2883ae28e3c3a24118eae2e (patch) | |
| tree | a9a6ee51295e62e6100885a11528b555015db089 | |
| parent | 3755bd83e239cef1239e285e9038f6cd5d98749b (diff) | |
juno32: build script generic mods to add juno32 support
Change-Id: Ia19273f8e73a01c8b460a2a1b0222fa15e388125
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | build-arm-tf.sh | 17 | ||||
| -rwxr-xr-x | build-target-bins.sh | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/build-arm-tf.sh b/build-arm-tf.sh index 8ae185f..16fca5b 100755 --- a/build-arm-tf.sh +++ b/build-arm-tf.sh @@ -62,7 +62,22 @@ do_build () #if optee enabled, set corresponding compiliation flags 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 + if [ "$ARM_TF_AARCH32_EL3_RUNTIME" == "1" ]; then + CROSS_COMPILE=$CROSS_COMPILE_32 \ + make -j $PARALLELISM PLAT=$plat ARCH=aarch32 DEBUG=$ARM_TF_DEBUG_ENABLED $ARM_TF_BL32_FLAGS bl32 + targets="bl1 bl2 bl31" + else + targets="all" + fi + # HACK: this is to deal with juno32 building ARM-TF BL1 and BL2 as Aarch64 + # but everything else as Aarch32 + if [ "$ARM_TF_ARCH" == "aarch32" ]; then + TMP_CROSS_COMPILE=$CROSS_COMPILE_32 + else + TMP_CROSS_COMPILE=$CROSS_COMPILE_64 + fi + CROSS_COMPILE=$TMP_CROSS_COMPILE \ + make -j $PARALLELISM PLAT=$plat ARCH=$ARM_TF_ARCH DEBUG=$ARM_TF_DEBUG_ENABLED ${atf_build_flags} ${targets} done # make tools diff --git a/build-target-bins.sh b/build-target-bins.sh index f63f47a..192b311 100755 --- a/build-target-bins.sh +++ b/build-target-bins.sh @@ -241,7 +241,7 @@ do_package() local bl2_fip_param="${bl2_param_id} ${OUTDIR}/${!tf_out}/tf-bl2.bin" local bl31_fip_param="${bl31_param_id} ${OUTDIR}/${!tf_out}/tf-bl31.bin" local bl32_fip_param= - if [ "$ARM_TF_ARCH" == "aarch32" ]; then + if [ "$ARM_TF_ARCH" == "aarch32" ] || [ "$ARM_TF_AARCH32_EL3_RUNTIME" == "1" ]; then bl32_fip_param="${bl32_param_id} ${OUTDIR}/${!tf_out}/tf-bl32.bin" fi local bl30_fip_param= |