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

Merge pull request #212 from pcossutta/master 

Add -X option to iceprog
This commit is contained in:
Clifford Wolf 2019-04-29 11:27:32 +02:00 committed by GitHub
parent d9ea2e15fc bd88dfe418
commit b1026f8b75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iceprog/iceprog.c
View File

@ -449,6 +449,7 @@ static void help(const char *progname)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "Mode of operation:\n"); fprintf(stderr, "Mode of operation:\n");
fprintf(stderr, " [default] write file contents to flash, then verify\n"); fprintf(stderr, " [default] write file contents to flash, then verify\n");
fprintf(stderr, " -X write file contents to flash only\n");
fprintf(stderr, " -r read first 256 kB from flash and write to file\n"); fprintf(stderr, " -r read first 256 kB from flash and write to file\n");
fprintf(stderr, " -R <size in bytes> read the specified number of bytes from flash\n"); fprintf(stderr, " -R <size in bytes> read the specified number of bytes from flash\n");
fprintf(stderr, " (append 'k' to the argument for size in kilobytes,\n"); fprintf(stderr, " (append 'k' to the argument for size in kilobytes,\n");
@ -517,6 +518,7 @@ int main(int argc, char **argv)
bool test_mode = false; bool test_mode = false;
bool slow_clock = false; bool slow_clock = false;
bool disable_protect = false; bool disable_protect = false;
bool disable_verify = false;
const char *filename = NULL; const char *filename = NULL;
const char *devstr = NULL; const char *devstr = NULL;
int ifnum = 0; int ifnum = 0;
@ -529,7 +531,7 @@ int main(int argc, char **argv)
/* Decode command line parameters */ /* Decode command line parameters */
int opt; int opt;
char *endptr; char *endptr;
while ((opt = getopt_long(argc, argv, "d:I:rR:e:o:cbnStvsp", long_options, NULL)) != -1) { while ((opt = getopt_long(argc, argv, "d:I:rR:e:o:cbnStvspX", long_options, NULL)) != -1) {
switch (opt) { switch (opt) {
case 'd': /* device string */ case 'd': /* device string */
devstr = optarg; devstr = optarg;
@ -616,6 +618,9 @@ int main(int argc, char **argv)
case 'p': /* disable flash protect before erase/write */ case 'p': /* disable flash protect before erase/write */
disable_protect = true; disable_protect = true;
break; break;
case 'X': /* disable verification */
disable_verify = true;
break;
case -2: case -2:
help(argv[0]); help(argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -921,7 +926,7 @@ int main(int argc, char **argv)
flash_read(rw_offset + addr, buffer, 256); flash_read(rw_offset + addr, buffer, 256);
fwrite(buffer, read_size - addr > 256 ? 256 : read_size - addr, 1, f); fwrite(buffer, read_size - addr > 256 ? 256 : read_size - addr, 1, f);
} }
} else if (!erase_mode) { } else if (!erase_mode && !disable_verify) {
fprintf(stderr, "reading..\n"); fprintf(stderr, "reading..\n");
for (int addr = 0; true; addr += 256) { for (int addr = 0; true; addr += 256) {
uint8_t buffer_flash[256], buffer_file[256]; uint8_t buffer_flash[256], buffer_file[256];