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

spiFlash: stop if jedec_id == 0xffffff

This commit is contained in:
Gwenhael Goavec-Merou 2022-06-02 08:52:56 +02:00
parent 1f842e4ebc
commit c64f1970d6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/spiFlash.cpp
View File

@ -272,8 +272,15 @@ bool SPIFlash::dump(const std::string &filename, const int &base_addr,
int SPIFlash::erase_and_prog(int base_addr, uint8_t *data, int len)
{
if (_jedec_id == 0)
read_id();
if (_jedec_id == 0) {
try {
read_id();
} catch(std::exception &e) {
printError(e.what());
return -1;
}
}
bool must_relock = false; // used to relock after write;
/* microchip SST26VF032B have global lock set
@ -432,6 +439,10 @@ void SPIFlash::read_id()
printf("%x ", rx[i]);
}
/* something wrong with read */
if ((_jedec_id >> 8) == 0xffff)
throw std::runtime_error("Read ID failed");
if (_verbose > 0)
printf("read %x\n", _jedec_id);
auto t = flash_list.find(_jedec_id >> 8);