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

lattice: flash EBR when jed has this section

This commit is contained in:
Gwenhael Goavec-Merou 2020-05-02 09:47:41 +02:00
parent 099123277c
commit 4847700b84
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lattice.cpp
View File

@ -256,7 +256,7 @@ bool Lattice::program_intFlash()
uint64_t featuresRow; uint64_t featuresRow;
uint16_t feabits; uint16_t feabits;
uint8_t eraseMode; uint8_t eraseMode;
vector<string> ufm_data, cfg_data; vector<string> ufm_data, cfg_data, ebr_data;
JedParser _jed(_filename, _verbose); JedParser _jed(_filename, _verbose);
@ -293,6 +293,8 @@ bool Lattice::program_intFlash()
ufm_data = _jed.data_for_section(i); ufm_data = _jed.data_for_section(i);
} else if (note == "END CONFIG DATA") { } else if (note == "END CONFIG DATA") {
continue; continue;
} else if (note == "EBR_INIT DATA") {
ebr_data = _jed.data_for_section(i);
} else { } else {
cfg_data = _jed.data_for_section(i); cfg_data = _jed.data_for_section(i);
} }
@ -320,8 +322,14 @@ bool Lattice::program_intFlash()
_jtag->toggleClk(1000); _jtag->toggleClk(1000);
/* flash CfgFlash */ /* flash CfgFlash */
if (false == flashProg(0, cfg_data)) if (false == flashProg(0, "data", cfg_data))
return false; return false;
/* flash EBR Init */
if (ebr_data.size()) {
if (false == flashProg(0, "EBR", ebr_data))
return false;
}
/* verify write */ /* verify write */
if (Verify(cfg_data) == false) if (Verify(cfg_data) == false)
return false; return false;
@ -747,10 +755,10 @@ bool Lattice::flashErase(uint8_t mask)
return true; return true;
} }
bool Lattice::flashProg(uint32_t start_addr, std::vector<std::string> data) bool Lattice::flashProg(uint32_t start_addr, string name, vector<string> data)
{ {
(void)start_addr; (void)start_addr;
ProgressBar progress("Writing", data.size(), 50); ProgressBar progress("Writing " + name, data.size(), 50);
for (uint32_t line = 0; line < data.size(); line++) { for (uint32_t line = 0; line < data.size(); line++) {
wr_rd(PROG_CFG_FLASH, (uint8_t *)data[line].c_str(), wr_rd(PROG_CFG_FLASH, (uint8_t *)data[line].c_str(),
16, NULL, 0); 16, NULL, 0);

3
src/lattice.hpp
View File

@ -61,7 +61,8 @@ class Lattice: public Device, SPIInterface {
bool pollBusyFlag(bool verbose = false); bool pollBusyFlag(bool verbose = false);
bool flashEraseAll(); bool flashEraseAll();
bool flashErase(uint8_t mask); bool flashErase(uint8_t mask);
bool flashProg(uint32_t start_addr, std::vector<std::string> data); bool flashProg(uint32_t start_addr, std::string name,
std::vector<std::string> data);
bool checkStatus(uint32_t val, uint32_t mask); bool checkStatus(uint32_t val, uint32_t mask);
void displayReadReg(uint32_t dev); void displayReadReg(uint32_t dev);
uint32_t readStatusReg(); uint32_t readStatusReg();