diff options
| author | Thomas Abraham <thomas.abraham@arm.com> | 2018-06-17 01:28:08 +0530 |
|---|---|---|
| committer | Thomas Abraham <thomas.abraham@arm.com> | 2018-06-23 02:04:29 +0530 |
| commit | bc94edb1564c25a8e590390d0c28de8300dacb5c (patch) | |
| tree | 97345cdb06f938294c84c41b9070e7bd5d6ada57 | |
| parent | d3ead2c8d2301deea5071706364305a3661c5528 (diff) | |
target-bin: switch to using fiptool
Use of fip_create to create the fip image has been deprecated.
So replace all uses of fip_create with fiptool.
Change-Id: I66c383aa2b8c77f7643051d00a197a4fcbde2035
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
| -rwxr-xr-x | build-target-bins.sh | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/build-target-bins.sh b/build-target-bins.sh index 805cf39..685be3c 100755 --- a/build-target-bins.sh +++ b/build-target-bins.sh @@ -205,28 +205,15 @@ do_package() if [ "$ARM_TF_PATH" != "" ]; then # Now do the platform stuff... - local fip_tool=$TOP_DIR/$ARM_TF_PATH/tools/fip_create/fip_create - - # From LT release 16.01 onwards, fip tool param identifiers have changed - # To maintain backward compatibility within build script, dynamically - # select identifiers - - if(${fip_tool} --help | grep "\-\-scp-fwu-cfg") - then - echo "Using TBBR spec terminology for image name identifiers" - local bl2_param_id="--tb-fw" - local bl30_param_id="--scp-fw" - local bl31_param_id="--soc-fw" - local bl32_param_id="--tos-fw" - local bl33_param_id="--nt-fw" - else - echo "Using legacy terminology for image name identifiers" - local bl2_param_id="--bl2" - local bl30_param_id="--bl30" - local bl31_param_id="--bl31" - local bl32_param_id="--bl32" - local bl33_param_id="--bl33" - fi + local fip_tool=$TOP_DIR/$ARM_TF_PATH/tools/fiptool/fiptool + + echo "Using TBBR spec terminology for image name identifiers" + local bl2_param_id="--tb-fw" + local bl30_param_id="--scp-fw" + local bl31_param_id="--soc-fw" + local bl32_param_id="--tos-fw" + local bl33_param_id="--nt-fw" + for target in $TARGET_BINS_PLATS; do local tf_out=TARGET_$target[arm-tf] local scp_out=TARGET_$target[scp] @@ -327,11 +314,11 @@ do_package() ${bl33_param_id} ${OUTDIR}/${!uefi_out}/uefi.bin fi - ${fip_tool} \ + ${fip_tool} update \ ${fip_param} \ ${bl33_param_id} ${OUTDIR}/${!uefi_out}/uefi.bin \ ${PLATDIR}/${!target_name}/fip-uefi.bin - ${fip_tool} --dump \ + ${fip_tool} info \ ${PLATDIR}/${!target_name}/fip-uefi.bin fi |