luke/openFPGALoader
1
0
Fork 0
mirror of https://github.com/trabucayre/openFPGALoader.git synced 2026-08-22 14:17:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #701 from pkuzmin/fix-xilinx-spiflash-mcs-prog

Browse Source 
Fix for programming mcs file to unknown SPI flash memory model.
This commit is contained in:
Gwenhael Goavec-Merou
2026-08-05 22:39:52 +02:00
committed by GitHub
parent d402bdbd7b 93a78aaa44
commit e20a34400e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spiFlash.cpp
+5 -8
View File
@@ -468,9 +468,10 @@ bool SPIFlash::erase_and_prog(const std::vector<FlashDataSection> &sections, boo
uint32_t len = 0, flash_len;
uint32_t base_addr = 0;
/* For full erase and to check BP: consider the full flash size */
if (full_erase) {
if (_flash_model && full_erase) {
flash_len = _flash_model->nr_sector * 0x10000;
} else { /* not a full erase: consider bottom base_addr and upper address */
full_erase = false;
base_addr = sections.front().getStartAddr();
flash_len = sections.back().getCurrentAddr() - base_addr;
}
@@ -489,12 +490,8 @@ bool SPIFlash::erase_and_prog(const std::vector<FlashDataSection> &sections, boo
return false;
} else {
printInfo("Erase Flash: ", false);
if (sectors_erase(base_addr, len) == -1) {
printError("FAIL");
return -1;
} else {
printSuccess("DONE");
}
if (sectors_erase(base_addr, len) == -1)
return false;
}
ProgressBar progress("Writing", len, 50, _verbose < 0);
@@ -511,7 +508,7 @@ bool SPIFlash::erase_and_prog(const std::vector<FlashDataSection> &sections, boo
size = 1;
}
if (write_page(base_addr + addr, ptr, size) == -1)
return -1;
return false;
progress.display(len_done);
}
}