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

spiFlash: added ask before writting TB when OTP, added missing write_enable and fixed mask

This commit is contained in:
Gwenhael Goavec-Merou 2024-06-03 15:23:12 +02:00
parent be188c0223
commit 2b80ce158b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/spiFlash.cpp
View File

@ -202,6 +202,8 @@ int SPIFlash::sectors_erase(int base_addr, int size)
if (!sector_rdy) if (!sector_rdy)
step = 0x1000; step = 0x1000;
printf("start addr: %08x, end_addr: %08x\n", base_addr, (base_addr + size + 0xffff) & ~0xffff);
for (int addr = start_addr; addr < end_addr; addr += step) { for (int addr = start_addr; addr < end_addr; addr += step) {
if (write_enable() == -1) { if (write_enable() == -1) {
ret = -1; ret = -1;
@ -770,8 +772,13 @@ int SPIFlash::enable_protection(uint32_t length)
uint8_t tb = get_tb(); uint8_t tb = get_tb();
/* check if TB is set */ /* check if TB is set */
if (tb == 0) { if (tb == 0) {
printError("TOP/BOTTOM bit is OTP: can't write this bit"); std::string confirm{};
return -1; printError("TOP/BOTTOM bit is OTP: changing this bit is irreversible");
printError("Please confirm modification y/n");
std::cin >> confirm;
if (confirm != "y")
return -1;
} }
} }
@ -823,6 +830,10 @@ int SPIFlash::enable_protection(uint32_t length)
} }
/* write status register and wait until Flash idle */ /* write status register and wait until Flash idle */
if (write_enable() != 0) {
printError("Error: failed to enable write");
return -1;
}
_spi->spi_put(reg_wr, &val, NULL, 1); _spi->spi_put(reg_wr, &val, NULL, 1);
if (_spi->spi_wait(FLASH_RDSR, 0x03, 0, 1000) < 0) { if (_spi->spi_wait(FLASH_RDSR, 0x03, 0, 1000) < 0) {
printError("Error: enable protection failed\n"); printError("Error: enable protection failed\n");
@ -830,7 +841,7 @@ int SPIFlash::enable_protection(uint32_t length)
} }
uint8_t rd_val; uint8_t rd_val;
_spi->spi_put(reg_rd, NULL, &rd_val, 1); _spi->spi_put(reg_rd, NULL, &rd_val, 1);
if (rd_val != val) { if ((rd_val & val) == 0) {
printError("failed to update TB bit"); printError("failed to update TB bit");
return -1; return -1;
} }