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

artiq_flash: fix sayma amc tap/pld index

This commit is contained in:
Robert Jördens 2017-11-01 14:45:07 +01:00
parent e16ab69f01
commit 62320432a5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/frontend/artiq_flash.py
View File

@ -109,11 +109,11 @@ class ProgrammerJtagSpi7(Programmer):
preinit_commands) preinit_commands)
self.init() self.init()
def load(self, bitfile): def load(self, bitfile, pld=0):
self.prog.append("pld load 0 " + bitfile) self.prog.append("pld load {} {{{}}}".format(pld, bitfile))
def proxy(self, proxy_bitfile): def proxy(self, proxy_bitfile, pld=0):
self.prog.append("jtagspi_init 0 {{{}}}".format(proxy_bitfile)) self.prog.append("jtagspi_init {} {{{}}}".format(pld, proxy_bitfile))
def flash_binary(self, flashno, address, filename): def flash_binary(self, flashno, address, filename):
# jtagspi_program supports only one flash # jtagspi_program supports only one flash
@ -143,9 +143,9 @@ class ProgrammerSayma(Programmer):
"adapter_khz 5000", "adapter_khz 5000",
"transport select jtag", "transport select jtag",
"source [find cpld/xilinx-xc7.cfg]", "source [find cpld/xilinx-xc7.cfg]", # tap 0, pld 0
"set CHIP XCKU040", "set CHIP XCKU040",
"source [find cpld/xilinx-xcu.cfg]", "source [find cpld/xilinx-xcu.cfg]", # tap 1, pld 1
"set XILINX_USER1 0x02", "set XILINX_USER1 0x02",
"set XILINX_USER2 0x03", "set XILINX_USER2 0x03",
@ -156,14 +156,12 @@ class ProgrammerSayma(Programmer):
] ]
self.init() self.init()
def load(self, bitfile): def load(self, bitfile, pld=1):
self.prog.append("pld load 0 " + bitfile) self.prog.append("pld load {} {{{}}}".format(pld, bitfile))
def proxy(self, proxy_bitfile): def proxy(self, proxy_bitfile, pld=1):
self.prog += [ self.load(proxy_bitfile, pld)
"pld load 0 " + proxy_bitfile, self.prog.append("reset halt")
"reset halt"
]
def flash_binary(self, flashno, address, filename): def flash_binary(self, flashno, address, filename):
self.prog += [ self.prog += [