M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_flash: ignore RTM FPGA 

It has no flash connected, and attempting to detect it causes unnecessary program failure when the RTM is not present.
This commit is contained in:
Sebastien Bourdeauducq 2017-12-31 12:10:16 +08:00
parent 38ce1f1d5d
commit 100bda2582
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/frontend/artiq_flash.py
View File

@ -147,9 +147,8 @@ class ProgrammerSayma(Programmer):
"adapter_khz 5000", "adapter_khz 5000",
"transport select jtag", "transport select jtag",
"source [find cpld/xilinx-xc7.cfg]", # tap 0, pld 0
"set CHIP XCKU040", "set CHIP XCKU040",
"source [find cpld/xilinx-xcu.cfg]", # tap 1, pld 1 "source [find cpld/xilinx-xcu.cfg]",
"target create xcu.proxy testee -chain-position xcu.tap", "target create xcu.proxy testee -chain-position xcu.tap",
"set XILINX_USER1 0x02", "set XILINX_USER1 0x02",
@ -159,11 +158,11 @@ class ProgrammerSayma(Programmer):
] ]
self.init() self.init()
def load(self, bitfile, pld=1): def load(self, bitfile):
self.prog.append("pld load {} {{{}}}".format(pld, bitfile)) self.prog.append("pld load 0 {{{}}}".format(bitfile))
def proxy(self, proxy_bitfile, pld=1): def proxy(self, proxy_bitfile):
self.load(proxy_bitfile, pld) self.load(proxy_bitfile)
self.prog.append("reset halt") self.prog.append("reset halt")
def flash_binary(self, flashno, address, filename): def flash_binary(self, flashno, address, filename):