Vivado programming: Use correct variable in error message

hw_device is not available outside of the loop, I should have used hw_target instead. Also improve the error message when programming fails. Experience shows that a very common error is a wrong jumper setting. Give users a hint about that.
olofk · Nov 1, 2019 · 602a48d · 602a48d
1 parent 4138b6a
commit 602a48d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/edalize/templates/vivado/vivado-program.tcl.j2 b/edalize/templates/vivado/vivado-program.tcl.j2
@@ -50,12 +50,13 @@ foreach { hw_target } [get_hw_targets] {
         break
     } else {
         # Close currently tried device, and try with next one.
-        puts "INFO: Part not found as part of $hw_device. Trying next device."
+        puts "INFO: Part not found as part of $hw_target. Trying next device."
         close_hw_target
     }
 }
 if { $hw_device_found == 0 } {
-    puts "ERROR: None of the hardware targets included a $part FPGA part."
+    puts "ERROR: None of the hardware targets included a $part FPGA part. \
+        Check cables and ensure that jumpers are correct for JTAG programming."
     exit 1
 }
 puts "INFO: Programming bitstream to device $hw_device on target $hw_target."

diff --git a/tests/test_vivado/minimal/test_vivado_minimal_0_pgm.tcl b/tests/test_vivado/minimal/test_vivado_minimal_0_pgm.tcl
@@ -50,12 +50,13 @@ foreach { hw_target } [get_hw_targets] {
         break
     } else {
         # Close currently tried device, and try with next one.
-        puts "INFO: Part not found as part of $hw_device. Trying next device."
+        puts "INFO: Part not found as part of $hw_target. Trying next device."
         close_hw_target
     }
 }
 if { $hw_device_found == 0 } {
-    puts "ERROR: None of the hardware targets included a $part FPGA part."
+    puts "ERROR: None of the hardware targets included a $part FPGA part. \
+        Check cables and ensure that jumpers are correct for JTAG programming."
     exit 1
 }
 puts "INFO: Programming bitstream to device $hw_device on target $hw_target."

diff --git a/tests/test_vivado/test_vivado_0_pgm.tcl b/tests/test_vivado/test_vivado_0_pgm.tcl
@@ -50,12 +50,13 @@ foreach { hw_target } [get_hw_targets] {
         break
     } else {
         # Close currently tried device, and try with next one.
-        puts "INFO: Part not found as part of $hw_device. Trying next device."
+        puts "INFO: Part not found as part of $hw_target. Trying next device."
         close_hw_target
     }
 }
 if { $hw_device_found == 0 } {
-    puts "ERROR: None of the hardware targets included a $part FPGA part."
+    puts "ERROR: None of the hardware targets included a $part FPGA part. \
+        Check cables and ensure that jumpers are correct for JTAG programming."
     exit 1
 }
 puts "INFO: Programming bitstream to device $hw_device on target $hw_target."