aboutsummaryrefslogtreecommitdiff
path: root/el3_payload
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2019-05-10 13:23:41 +0200
committerSandrine Bailleux <sandrine.bailleux@arm.com>2019-05-10 14:31:07 +0200
commit47ab4f4fd1c650eff22844593577814a095952dd (patch)
tree522f39bd3f176b4d74c4eda9aaf302e61b7e9444 /el3_payload
parent2755ecb5dcab5fac6295245a15afaecfff8eba78 (diff)
downloadtf-a-tests-47ab4f4fd1c650eff22844593577814a095952dd.tar.gz
Adapt run_ds5_script.sh for recent Arm DS versions
Arm DS-5 has been superseded by Arm Development Studio. Do the necessary changes to the EL3 payload scripts to migrate to the latter: - Rename run_ds5_script.sh into run_armds_script.sh. - The command-line debugger is now called armdbg. - The CDB entry string for Arm Juno development board has changed. Change-Id: Idc640e7fcff790d5a1bf6e938e14a0dbc88029b9 Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
Diffstat (limited to 'el3_payload')
-rw-r--r--el3_payload/Makefile4
-rwxr-xr-xel3_payload/scripts/juno/run_armds_script.sh (renamed from el3_payload/scripts/juno/run_ds5_script.sh)12
2 files changed, 8 insertions, 8 deletions
diff --git a/el3_payload/Makefile b/el3_payload/Makefile
index 9e6fe04d2..984f60d55 100644
--- a/el3_payload/Makefile
+++ b/el3_payload/Makefile
@@ -69,8 +69,8 @@ distclean: clean
run: run_${PLAT}
-run_juno: ${ELF} scripts/juno/run_ds5_script.sh scripts/juno/load_el3_payload.ds
- scripts/juno/run_ds5_script.sh scripts/juno/load_el3_payload.ds
+run_juno: ${ELF} scripts/juno/run_armds_script.sh scripts/juno/load_el3_payload.ds
+ scripts/juno/run_armds_script.sh scripts/juno/load_el3_payload.ds
run_fvp: scripts/fvp/run_fvp.sh
scripts/fvp/run_fvp.sh
diff --git a/el3_payload/scripts/juno/run_ds5_script.sh b/el3_payload/scripts/juno/run_armds_script.sh
index 67d07365a..b2d6b1744 100755
--- a/el3_payload/scripts/juno/run_ds5_script.sh
+++ b/el3_payload/scripts/juno/run_armds_script.sh
@@ -5,26 +5,26 @@ set -e
# Expect the script to run in argument
if [ $# != 1 ]; then
echo "ERROR: No script provided"
- echo "usage: $(basename $0) <ds5_script_to_run>"
+ echo "usage: $(basename $0) <armds_script_to_run>"
exit 1
fi
# Is DS-5 command-line debugger found?
-if [ ! $(which debugger) ]; then
+if [ ! $(which armdbg) ]; then
echo 'ERROR: Failed to find DS-5 command-line debugger.'
- echo 'Please add the path to the command-line debugger in your PATH.'
+ echo 'Please add the path to the armdbg program in your PATH.'
echo 'E.g.: export PATH=<DS-5 install dir>/bin:$PATH'
exit 1
fi
# DS-5 configuration database entry for Juno r0
-juno_cdb_entry='ARM Development Boards::Juno ARM Development Platform (r0)::Bare Metal Debug::Bare Metal Debug::Debug Cortex-A53_0::DSTREAM'
+juno_cdb_entry='Arm::Juno Arm Development Platform (r0)::Bare Metal Debug::Bare Metal Debug::Debug Cortex-A53_0::DSTREAM'
# Browse for available DSTREAM connections and lists targets that match the
# connection type specified in the configuration database entry
echo "Trying to detect your DSTREAM unit..."
connections_list=available_connections
-debugger --cdb-entry "$juno_cdb_entry" --browse \
+armdbg --cdb-entry "$juno_cdb_entry" --browse \
| tee $connections_list
# Remove first line in the file (i.e. "Available connections:")
@@ -42,7 +42,7 @@ fi
# Run DS-5 script
echo "Connecting to $connection..."
-debugger \
+armdbg \
--cdb-entry "$juno_cdb_entry" \
--cdb-entry-param "Connection=$connection" \
--stop_on_connect=false \