patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

soc/xtensa/intel_adsp/tools: Make cavstwist.sh accept ssh port

Browse source 
Sometimes the remote ssh server is not on default port. This patch makes
cavstwist.sh accept an ssh port in the host address: host[:port].

Signed-off-by: Ederson de Souza <ederson.desouza@intel.com>
This commit is contained in:
Ederson de Souza 2022-04-26 16:11:09 -07:00 committed by Anas Nashif
parent 29677da91f
commit ddb779e31d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
soc/xtensa/intel_adsp/tools/cavstwist.sh
View file

@ -65,7 +65,7 @@ set -e
if [ -z "$CAVS_HOST" -o -z "$CAVS_KEY" -o -z "$CAVS_RIMAGE" ]; then
echo "Missing cavstwist.sh configuration, must have:" 1>&2
echo " export CAVS_HOST=ssh_host_name" 1>&2
echo " export CAVS_HOST=ssh_host_name[:port]" 1>&2
echo " export CAVS_KEY=/path/to/signing_key.pem" 1>&2
echo " export CAVS_RIMAGE=/path/to/built/rimage/dir" 1>&2
exit 1
@ -112,14 +112,14 @@ if [ "$DO_LOAD" = "1" ]; then
# Must "accept" the file so the next signing script knows it's OK
# to write a new one
mv $IMAGE $IMAGE2
scp $IMAGE2 $CAVSTOOL $CAVS_HOST:
scp $IMAGE2 $CAVSTOOL scp://$CAVS_HOST
rm -f $IMAGE2
# Twister seems to overlap tests by a tiny bit, and of course the
# remote system might have other junk running from manual testing.
# If something is doing log reading at the moment of firmware
# load, it tends fairly reliably to hang the DSP. Kill it.
ssh $CAVS_HOST "sudo pkill -9 -f cavstool" ||:
ssh ssh://$CAVS_HOST "sudo pkill -9 -f cavstool" ||:
exec ssh $CAVS_HOST "sudo ./$(basename $CAVSTOOL) $(basename $IMAGE2)"
exec ssh ssh://$CAVS_HOST "sudo ./$(basename $CAVSTOOL) $(basename $IMAGE2)"
fi