FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-16 08:12:53 +08:00
Code Issues Projects Releases Wiki Activity

Allow boot and reset even if flashing is not supported

Browse Source
This commit is contained in:
Alex Forencich 2021-09-13 16:17:55 -07:00
parent 3d64e5fc30
commit 4704115974
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
utils/mqnic-fw.c
View File

@ -585,14 +585,14 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "Invalid flash ID\n"); fprintf(stderr, "Invalid flash ID\n");
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
if (fpga_id == 0 || fpga_id == 0xffffffff) if (fpga_id == 0 || fpga_id == 0xffffffff)
{ {
fprintf(stderr, "Invalid FPGA ID\n"); fprintf(stderr, "Invalid FPGA ID\n");
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
int bitswap = 0; int bitswap = 0;
@ -618,7 +618,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "Failed to connect to flash device\n"); fprintf(stderr, "Failed to connect to flash device\n");
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
flash_size = pri_flash->size+sec_flash->size; flash_size = pri_flash->size+sec_flash->size;
@ -632,7 +632,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "Failed to connect to flash device\n"); fprintf(stderr, "Failed to connect to flash device\n");
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
flash_size = pri_flash->size; flash_size = pri_flash->size;
@ -660,7 +660,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "Failed to connect to flash device\n"); fprintf(stderr, "Failed to connect to flash device\n");
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
flash_size = pri_flash->size; flash_size = pri_flash->size;
@ -669,7 +669,7 @@ int main(int argc, char *argv[])
{ {
fprintf(stderr, "Unknown flash type: %d\n", flash_type); fprintf(stderr, "Unknown flash type: %d\n", flash_type);
ret = -1; ret = -1;
goto err; goto skip_flash;
} }
switch (flash_configuration) switch (flash_configuration)
@ -738,7 +738,7 @@ int main(int argc, char *argv[])
} }
} }
if (slot < 0 || slot >= flash_segment_count) if ((action_read || action_write) && (slot < 0 || slot >= flash_segment_count))
{ {
fprintf(stderr, "Requested slot is not valid (%d)\n", slot); fprintf(stderr, "Requested slot is not valid (%d)\n", slot);
ret = -1; ret = -1;
@ -1168,8 +1168,15 @@ int main(int argc, char *argv[])
free(segment); free(segment);
} }
if (ret) skip_flash:
if (ret && (action_read || action_write))
{
goto err; goto err;
}
else
{
ret = 0;
}
flash_release(pri_flash); flash_release(pri_flash);
pri_flash = NULL; pri_flash = NULL;