From c5496632ede2face04bbe17963348718cc4155c9 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Tue, 30 Jan 2018 14:36:43 -0800 Subject: [PATCH] fasm2bit: bit argument. remove prog hack Signed-off-by: John McMaster --- minitests/roi_harness/fasm2bit.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/minitests/roi_harness/fasm2bit.sh b/minitests/roi_harness/fasm2bit.sh index 0f064664..3e7798c9 100755 --- a/minitests/roi_harness/fasm2bit.sh +++ b/minitests/roi_harness/fasm2bit.sh @@ -14,9 +14,18 @@ if [ -z "$bit_in" ] ; then echo "need .bit arg" exit fi +bit_out=$3 +if [ -z "$bit_out" ] ; then + bit_out=$(echo $fasm_in |sed s/.fasm/.bit/) + if [ "$bit_out" = "$fasm_in" ] ; then + echo "Expected fasm file" + exit 1 + fi +fi echo "Design .fasm: $fasm_in" echo "Harness .bit: $bit_in" +echo "Out .bit: $bit_out" ${XRAY_DIR}/tools/fasm2frame.py $fasm_in roi_partial.frm @@ -42,7 +51,7 @@ xxd -p -s 0x216abf $bit_in | \ fold -w 40 | \ xxd -r -p - final_sequence.bin -cat init_sequence.bit no_headers.bin final_sequence.bin >hand_crafted.bit +cat init_sequence.bit no_headers.bin final_sequence.bin >$bit_out -openocd -f openocd-basys3.cfg -c "init; pld load 0 hand_crafted.bit; exit" +#openocd -f $XRAY_DIR/utils/openocd/board-digilent-basys3.cfg -c "init; pld load 0 $bit_out; exit"