build/xilinx/programmer: fix programmer for vivado 2017.x

m-labs · Jun 28, 2017 · e4ae7b3 · e4ae7b3
1 parent 9a6fdea
commit e4ae7b3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/migen/build/xilinx/programmer.py b/migen/build/xilinx/programmer.py
@@ -128,10 +128,10 @@ def __init__(self, vivado_path="/opt/Xilinx/Vivado", vivado_ver=None,
         self.vivado_ver = vivado_ver
         self.flash_part = flash_part
 
-    def load_bitstream(self, bitstream_file):
+    def load_bitstream(self, bitstream_file, target=""):
         cmds = """open_hw
 connect_hw_server
-open_hw_target [lindex [get_hw_targets -of_objects [get_hw_servers localhost]] 0]
+open_hw_target {target}
 
 set_property PROBES.FILE {{}} [lindex [get_hw_devices] 0]
 set_property PROGRAM.FILE {{{bitstream}}} [lindex [get_hw_devices] 0]
@@ -140,14 +140,14 @@ def load_bitstream(self, bitstream_file):
 refresh_hw_device [lindex [get_hw_devices] 0]
 
 quit
-""".format(bitstream=bitstream_file)
+""".format(target=target, bitstream=bitstream_file)
         _run_vivado(self.vivado_path, self.vivado_ver, cmds)
 
     # XXX works to flash bitstream, adapt it to flash bios
     def flash(self, address, data_file):
         cmds = """open_hw
 connect_hw_server
-open_hw_target [lindex [get_hw_targets -of_objects [get_hw_servers localhost]] 0]
+open_hw_target
 create_hw_cfgmem -hw_device [lindex [get_hw_devices] 0] -mem_dev  [lindex [get_cfgmem_parts {{{flash_part}}}] 0]
 
 set_property PROGRAM.BLANK_CHECK  0 [ get_property PROGRAM.HW_CFGMEM [lindex [get_hw_devices] 0 ]]