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

Merge branch 'opt_skip_powerdown' of https://github.com/smunaut/icestorm

This commit is contained in:
Claire Wolf 2020-04-22 18:06:59 +02:00
parent df59d5997c dcda69d9f0
commit 56a688fb8f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iceprog/iceprog.c
View File

@ -470,6 +470,7 @@ static void help(const char *progname)
fprintf(stderr, " (append 'k' to the argument for size in kilobytes,\n"); fprintf(stderr, " (append 'k' to the argument for size in kilobytes,\n");
fprintf(stderr, " or 'M' for size in megabytes)\n"); fprintf(stderr, " or 'M' for size in megabytes)\n");
fprintf(stderr, " -s slow SPI (50 kHz instead of 6 MHz)\n"); fprintf(stderr, " -s slow SPI (50 kHz instead of 6 MHz)\n");
fprintf(stderr, " -k keep flash in powered up state (i.e. skip power down command)\n");
fprintf(stderr, " -v verbose output\n"); fprintf(stderr, " -v verbose output\n");
fprintf(stderr, " -i [4,32,64] select erase block size [default: 64k]\n"); fprintf(stderr, " -i [4,32,64] select erase block size [default: 64k]\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@ -546,6 +547,7 @@ int main(int argc, char **argv)
bool slow_clock = false; bool slow_clock = false;
bool disable_protect = false; bool disable_protect = false;
bool disable_verify = false; bool disable_verify = false;
bool disable_powerdown = false;
const char *filename = NULL; const char *filename = NULL;
const char *devstr = NULL; const char *devstr = NULL;
int ifnum = 0; int ifnum = 0;
@ -563,7 +565,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:I:rR:e:o:cbnStvspX", long_options, NULL)) != -1) { while ((opt = getopt_long(argc, argv, "d:i:I:rR:e:o:cbnStvspXk", long_options, NULL)) != -1) {
switch (opt) { switch (opt) {
case 'd': /* device string */ case 'd': /* device string */
devstr = optarg; devstr = optarg;
@ -665,6 +667,9 @@ int main(int argc, char **argv)
case 'X': /* disable verification */ case 'X': /* disable verification */
disable_verify = true; disable_verify = true;
break; break;
case 'k': /* disable power down command */
disable_powerdown = true;
break;
case -2: case -2:
help(argv[0]); help(argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -1004,7 +1009,8 @@ int main(int argc, char **argv)
// Reset // Reset
// --------------------------------------------------------- // ---------------------------------------------------------
flash_power_down(); if (!disable_powerdown)
flash_power_down();
set_cs_creset(1, 1); set_cs_creset(1, 1);
usleep(250000); usleep(250000);