From cd12ebf9e9085a330e47176699172befd9264a48 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Mon, 6 Jul 2020 11:06:18 +0800 Subject: [PATCH] run scripts: added option to avoid loading bitstream --- local_run.sh | 17 ++++++++++++++--- remote_run.sh | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/local_run.sh b/local_run.sh index 940ae44..c314fb0 100755 --- a/local_run.sh +++ b/local_run.sh @@ -3,19 +3,30 @@ set -e impure=0 +load_bitstream=1 -while getopts "h:i" opt; do +while getopts "h:i:l" opt; do case "$opt" in \?) exit 1 ;; i) impure=1 ;; + l) load_bitstream=0 + ;; esac done +load_bitstream_cmd="" + cd openocd if [ $impure -eq 1 ]; then - openocd -f zc706.cfg -c 'pld load 0 ../build/gateware/top.bit; load_image ../build/firmware/armv7-none-eabihf/release/szl; resume 0; exit' + if [ $load_bitstream -eq 1 ]; then + load_bitstream_cmd="pld load 0 ../build/gateware/top.bit;" + fi + openocd -f zc706.cfg -c "$load_bitstream_cmd load_image ../build/firmware/armv7-none-eabihf/release/szl; resume 0; exit" else - openocd -f zc706.cfg -c 'pld load 0 ../result/top.bit; load_image ../result/szl.elf; resume 0; exit' + if [ $load_bitstream -eq 1 ]; then + load_bitstream_cmd="pld load 0 ../result/top.bit;" + fi + openocd -f zc706.cfg -c "$load_bitstream_cmd load_image ../result/szl.elf; resume 0; exit" fi diff --git a/remote_run.sh b/remote_run.sh index a8b4379..55d3a1d 100755 --- a/remote_run.sh +++ b/remote_run.sh @@ -7,8 +7,9 @@ impure=0 pure_dir="result" impure_dir="build" sshopts="" +load_bitstream=1 -while getopts "h:id:o:" opt; do +while getopts "h:id:o:l" opt; do case "$opt" in \?) exit 1 ;; @@ -21,10 +22,16 @@ while getopts "h:id:o:" opt; do ;; o) sshopts=$OPTARG ;; + l) load_bitstream=0 + ;; esac done target_folder="/tmp/zynq-$USER" +load_bitstream_cmd="" +if [ $load_bitstream -eq 1 ]; then + load_bitstream_cmd="pld load 0 top.bit;" +fi echo "Creating $target_folder..." ssh $sshopts $target_host "mkdir -p $target_folder" @@ -32,10 +39,14 @@ echo "Copying files..." rsync -e "ssh $sshopts" openocd/* $target_host:$target_folder if [ $impure -eq 1 ]; then rsync -e "ssh $sshopts" $impure_dir/firmware/armv7-none-eabihf/release/szl $target_host:$target_folder/szl.elf - rsync -e "ssh $sshopts" $impure_dir/gateware/top.bit $target_host:$target_folder + if [ $load_bitstream -eq 1 ]; then + rsync -e "ssh $sshopts" $impure_dir/gateware/top.bit $target_host:$target_folder + fi else rsync -e "ssh $sshopts" -Lc $pure_dir/szl.elf $target_host:$target_folder - rsync -e "ssh $sshopts" -Lc $pure_dir/top.bit $target_host:$target_folder + if [ $load_bitstream -eq 1 ]; then + rsync -e "ssh $sshopts" -Lc $pure_dir/top.bit $target_host:$target_folder + fi fi echo "Programming board..." -ssh $sshopts $target_host "cd $target_folder; openocd -f zc706.cfg -c 'pld load 0 top.bit; load_image szl.elf; resume 0; exit'" +ssh $sshopts $target_host "cd $target_folder; openocd -f zc706.cfg -c'$load_bitstream_cmd load_image szl.elf; resume 0; exit'"