luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xilinx: fix wait until done for spartan3e

This commit is contained in:
Gwenhael Goavec-Merou 2022-04-02 11:53:46 +02:00
parent 285cbde7f4
commit 08c460135e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xilinx.cpp
View File

@ -67,7 +67,7 @@ Xilinx::Xilinx(Jtag *jtag, const std::string &filename,
_fpga_family = KINTEX_FAMILY; _fpga_family = KINTEX_FAMILY;
} else if (family == "kintexus") { } else if (family == "kintexus") {
_fpga_family = KINTEXUS_FAMILY; _fpga_family = KINTEXUS_FAMILY;
} else if (family == "spartan3") { } else if (family.substr(0, 8) == "spartan3") {
_fpga_family = SPARTAN3_FAMILY; _fpga_family = SPARTAN3_FAMILY;
if (_mode != Device::MEM_MODE) { if (_mode != Device::MEM_MODE) {
throw std::runtime_error("Error: Only load to mem is supported"); throw std::runtime_error("Error: Only load to mem is supported");
@ -551,10 +551,18 @@ bool Xilinx::xc3s_flow_program(ConfigBitstreamParser *bit)
_jtag->toggleClk(1); _jtag->toggleClk(1);
flow_disable(); flow_disable();
uint8_t mask = 0x20; // Done bit
uint32_t idcode = _jtag->get_target_device_id();
if (fpga_list[idcode].family == "spartan3e") {
mask = 0x10; // ISC done dit
}
int retry = 100;
do { do {
if (_jtag->shiftIR(&tx_buf, &rx_buf, _irlen) < 0) if (_jtag->shiftIR(&tx_buf, &rx_buf, _irlen) < 0)
return false; return false;
} while (!(rx_buf & 0x20)); // wait until DONE if (_jtag->shiftDR(data, NULL, 1) < 0)
return false;
} while (!(rx_buf & mask) && (retry-- > 0)); // wait until mask
return true; return true;
} }