diff options
| author | Thomas Abraham <thomas.abraham@arm.com> | 2019-03-15 18:52:35 +0530 |
|---|---|---|
| committer | Thomas Abraham <thomas.abraham@arm.com> | 2019-09-24 10:45:43 +0530 |
| commit | ea0f1ba5702096677d658788f39b066914e89562 (patch) | |
| tree | 2a6daab81dc371e4e96afd2cb191fe832fba8191 | |
| parent | 704f5b64390e3dc42d10ce8c712d370de29c5cf7 (diff) | |
build-scp: align to changes in scp firmware binary namesARMLT-19.10
The SCP firmware binary names are now changed to scp_romfw.bin,
scp_ramfw.bin, mcp_romfw.bin and mcp_ramfw.bin. Align to these
changes in the scripts that operate the SCP/MCP firmware binary
images.
Change-Id: Ie0171da2de3bdd71f632d9e1a218adda1c707524
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
| -rwxr-xr-x | build-scp.sh | 16 | ||||
| -rwxr-xr-x | build-target-bins.sh | 4 | ||||
| -rwxr-xr-x | build-test-bins.sh | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/build-scp.sh b/build-scp.sh index 4c3123c..d69e731 100755 --- a/build-scp.sh +++ b/build-scp.sh @@ -91,15 +91,15 @@ do_package () if [ "$SCP_BUILD_ENABLED" == "1" ]; then pushd $TOP_DIR mkdir -p ${OUTDIR}/${plat} - cp ./${SCP_PATH}/output/scp_ramfw/${SCP_BUILD_MODE}/bin/firmware.bin ${OUTDIR}/${plat}/scp-ram.bin - cp ./${SCP_PATH}/output/scp_romfw/${SCP_BUILD_MODE}/bin/firmware.bin ${OUTDIR}/${plat}/scp-rom.bin + cp ./${SCP_PATH}/output/scp_ramfw/${SCP_BUILD_MODE}/bin/scp_ramfw.bin ${OUTDIR}/${plat}/ + cp ./${SCP_PATH}/output/scp_romfw/${SCP_BUILD_MODE}/bin/scp_romfw.bin ${OUTDIR}/${plat}/ if [ -d ${SCP_PATH}/output/mcp_romfw ]; then - cp ./${SCP_PATH}/output/mcp_romfw/${SCP_BUILD_MODE}/bin/firmware.bin ${OUTDIR}/${plat}/mcp-rom.bin + cp ./${SCP_PATH}/output/mcp_romfw/${SCP_BUILD_MODE}/bin/mcp_romfw.bin ${OUTDIR}/${plat}/ fi if [ -d ${SCP_PATH}/output/mcp_ramfw ]; then - cp ./${SCP_PATH}/output/mcp_ramfw/${SCP_BUILD_MODE}/bin/firmware.bin ${OUTDIR}/${plat}/mcp-ram.bin + cp ./${SCP_PATH}/output/mcp_ramfw/${SCP_BUILD_MODE}/bin/mcp_ramfw.bin ${OUTDIR}/${plat}/ fi if [[ "${SCP_BYPASS_ROM_SUPPORT[$plat]}" = true ]]; then @@ -112,12 +112,12 @@ do_package () local var=SCP_PREBUILT_RAMFW_${plat} local fw=${!var} if [ -e "$fw" ]; then - cp $fw ${OUTDIR}/${plat}/scp-ram.bin + cp $fw ${OUTDIR}/${plat}/scp_ramfw.bin fi var=SCP_PREBUILT_ROMFW_${plat} fw=${!var} if [ -e "$fw" ]; then - cp ${fw} ${OUTDIR}/${plat}/scp-rom.bin + cp ${fw} ${OUTDIR}/${plat}/scp_romfw.bin fi var=SCP_PREBUILT_ROMFW_BYPASS_${plat} fw=${!var} @@ -129,12 +129,12 @@ do_package () local mcp_var=MCP_PREBUILT_RAMFW_${plat} mcp_fw=${!mcp_var} if [ -e "$mcp_fw" ]; then - cp ${mcp_fw} ${OUTDIR}/${plat}/mcp-ram.bin + cp ${mcp_fw} ${OUTDIR}/${plat}/mcp_ramfw.bin fi mcp_var=MCP_PREBUILT_ROMFW_${plat} mcp_fw=${!mcp_var} if [ -e "$mcp_fw" ]; then - cp ${mcp_fw} ${OUTDIR}/${plat}/mcp-rom.bin + cp ${mcp_fw} ${OUTDIR}/${plat}/mcp_romfw.bin fi mcp_var=MCP_PREBUILT_ROMFW_BYPASS_${plat} mcp_fw=${!mcp_var} diff --git a/build-target-bins.sh b/build-target-bins.sh index e6c5ce3..7f92e7e 100755 --- a/build-target-bins.sh +++ b/build-target-bins.sh @@ -248,7 +248,7 @@ do_package() local target_name=TARGET_$target[output] if [ "${!scp_out}" != "" ]; then - bl30_fip_param="${bl30_param_id} ${OUTDIR}/${!scp_out}/scp-ram.bin" + bl30_fip_param="${bl30_param_id} ${OUTDIR}/${!scp_out}/scp_ramfw.bin" fi #Skip hw-configuration for fvp. @@ -384,7 +384,7 @@ do_package() create_tgt_symlinks ${!tf_out} ${!target_name} "tf-*" fi if [ "${!scp_out}" != "" ]; then - create_tgt_symlinks ${!scp_out} ${!target_name} "*cp-*" + create_tgt_symlinks ${!scp_out} ${!target_name} "*cp_*" fi if [ "${!uboot_out}" != "" ]; then create_tgt_symlinks ${!uboot_out} ${!target_name} "uboot*" diff --git a/build-test-bins.sh b/build-test-bins.sh index 5199e38..3a0fd4f 100755 --- a/build-test-bins.sh +++ b/build-test-bins.sh @@ -71,7 +71,7 @@ do_package() local bl30_fip_param= if [ "${!scp_out}" != "" ]; then - bl30_fip_param="--bl30 ${OUTDIR}/scp/${!scp_out}/scp-ram.bin" + bl30_fip_param="--bl30 ${OUTDIR}/scp/${!scp_out}/scp_ramfw.bin" fi if [ "${!tftf_out}" != "" ]; then |