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

Slightly more robust flash wait function. 

In cases when the FLASH chip is bit flaky and the status register
"bounces" this flash_wait should be able to perform a bit better.

Also added more verbose output around block erase.
This commit is contained in:
Piotr Esden-Tempski 2018-08-18 16:13:27 -07:00
parent 868ac2d93f
commit 9a58588772
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
iceprog/iceprog.c
View File

@ -527,26 +527,43 @@ static void flash_wait()
if (verbose)
fprintf(stderr, "waiting..");
int count = 0;
while (1)
{
uint8_t data[2] = { FC_RSR1 };
set_gpio(0, 0);
flash_chip_select(true);
xfer_spi(data, 2);
set_gpio(1, 0);
flash_chip_select(false);
if ((data[1] & 0x01) == 0)
break;
if (verbose) {
fprintf(stderr, ".");
fflush(stdout);
if ((data[1] & 0x01) == 0) {
if(count < 2) {
count++;
if (verbose) {
fprintf(stderr, "r");
fflush(stderr);
}
} else {
if (verbose) {
fprintf(stderr, "R");
fflush(stderr);
}
break;
}
} else {
if (verbose) {
fprintf(stderr, ".");
fflush(stderr);
}
count = 0;
}
usleep(1000);
}
if (verbose)
fprintf(stderr, "\n");
}
static void flash_disable_protection()
@ -973,7 +990,6 @@ int main(int argc, char **argv)
flash_release_reset();
usleep(100000);
if (test_mode)
{
fprintf(stderr, "reset..\n");
@ -1085,6 +1101,10 @@ int main(int argc, char **argv)
for (int addr = begin_addr; addr < end_addr; addr += 0x10000) {
flash_write_enable();
flash_64kB_sector_erase(addr);
if (verbose) {
fprintf(stderr, "Status after block erase:\n");
flash_read_status();
}
flash_wait();
}
}