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

artiq_flash: update for Sayma OpenOCD changes

This commit is contained in:
Sebastien Bourdeauducq 2017-11-01 20:11:18 +08:00
parent 99b99d436d
commit bfd36e7340
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artiq/frontend/artiq_flash.py
View File

@ -138,25 +138,21 @@ class ProgrammerSayma(Programmer):
# EN_USB_JTAG on ADBUS7: out, high # EN_USB_JTAG on ADBUS7: out, high
# nTRST on ADBUS4: out, high, but R46 is DNP # nTRST on ADBUS4: out, high, but R46 is DNP
"ftdi_layout_init 0x0098 0x008b", "ftdi_layout_init 0x0098 0x008b",
"ftdi_tdo_sample_edge falling", "reset_config none",
"ftdi_layout_signal nSRST -data 0x0080",
"reset_config srst_only srst_pulls_trst srst_gates_jtag srst_push_pull",
"adapter_khz 25000",
"adapter_khz 5000",
"transport select jtag", "transport select jtag",
"jtag newtap amc_xcu tap -irlen 6 -ignore-version -expected-id 0x03822093", "source [find cpld/xilinx-xc7.cfg]",
"set CHIP XCKU040",
"pld device virtex2 amc_xcu.tap 1", "source [find cpld/xilinx-xcu.cfg]",
"set XILINX_USER1 0x02", "set XILINX_USER1 0x02",
"set XILINX_USER2 0x03", "set XILINX_USER2 0x03",
"set AMC_DR_LEN 1", "set JTAGSPI_IR $XILINX_USER1",
"source [find cpld/jtagspi.cfg]",
"target create amc_xcu.proxy testee -chain-position amc_xcu.tap", "flash bank xcu.spi0 jtagspi 0 0 0 0 xcu.proxy $XILINX_USER1",
"flash bank amc_xcu.spi0 jtagspi 0 0 0 0 amc_xcu.proxy $XILINX_USER1 $AMC_DR_LEN", "flash bank xcu.spi1 jtagspi 0 0 0 0 xcu.proxy $XILINX_USER2"
"flash bank amc_xcu.spi1 jtagspi 0 0 0 0 amc_xcu.proxy $XILINX_USER2 $AMC_DR_LEN",
] ]
self.init() self.init()
@ -171,8 +167,8 @@ class ProgrammerSayma(Programmer):
def flash_binary(self, flashno, address, filename): def flash_binary(self, flashno, address, filename):
self.prog += [ self.prog += [
"flash probe amc_xcu.spi{}".format(flashno), "flash probe xcu.spi{}".format(flashno),
"irscan amc_xcu.tap $XILINX_USER{}".format(flashno+1), "irscan xcu.tap $XILINX_USER{}".format(flashno+1),
"flash write_bank {} {} 0x{:x}".format(flashno, filename, address) "flash write_bank {} {} 0x{:x}".format(flashno, filename, address)
] ]