add jtag frequency option
This commit is contained in:
parent
aa752856c3
commit
92888956f3
|
|
@ -104,6 +104,7 @@ openFPGALoader -- a program to flash cyclone10 LP FPGA
|
||||||
Gowin and ECP5 devices)
|
Gowin and ECP5 devices)
|
||||||
-o, --offset=OFFSET start offset in EEPROM
|
-o, --offset=OFFSET start offset in EEPROM
|
||||||
-r, --reset reset FPGA after operations
|
-r, --reset reset FPGA after operations
|
||||||
|
-s, --speed=SPEED jtag frequency (Hz)
|
||||||
-v, --verbose Produce verbose output
|
-v, --verbose Produce verbose output
|
||||||
-?, --help Give this help list
|
-?, --help Give this help list
|
||||||
--usage Give a short usage message
|
--usage Give a short usage message
|
||||||
|
|
|
||||||
38
src/main.cpp
38
src/main.cpp
|
|
@ -43,6 +43,7 @@ struct arguments {
|
||||||
string bit_file;
|
string bit_file;
|
||||||
string device;
|
string device;
|
||||||
string cable;
|
string cable;
|
||||||
|
string speed;
|
||||||
string board;
|
string board;
|
||||||
bool list_cables;
|
bool list_cables;
|
||||||
bool list_boards;
|
bool list_boards;
|
||||||
|
|
@ -64,6 +65,7 @@ static char args_doc[] = "BIT_FILE";
|
||||||
static error_t parse_opt(int key, char *arg, struct argp_state *state);
|
static error_t parse_opt(int key, char *arg, struct argp_state *state);
|
||||||
static struct argp_option options[] = {
|
static struct argp_option options[] = {
|
||||||
{"cable", 'c', "CABLE", 0, "jtag interface"},
|
{"cable", 'c', "CABLE", 0, "jtag interface"},
|
||||||
|
{"speed", 's', "SPEED", 0, "jtag frequency (Hz)"},
|
||||||
{"list-cables", LIST_CABLE, 0, 0, "list all supported cables"},
|
{"list-cables", LIST_CABLE, 0, 0, "list all supported cables"},
|
||||||
{"board", 'b', "BOARD", 0, "board name, may be used instead of cable"},
|
{"board", 'b', "BOARD", 0, "board name, may be used instead of cable"},
|
||||||
{"list-boards", LIST_BOARD, 0, 0, "list all supported boards"},
|
{"list-boards", LIST_BOARD, 0, 0, "list all supported boards"},
|
||||||
|
|
@ -91,7 +93,7 @@ int main(int argc, char **argv)
|
||||||
jtag_pins_conf_t *pins_config = NULL;
|
jtag_pins_conf_t *pins_config = NULL;
|
||||||
|
|
||||||
/* command line args. */
|
/* command line args. */
|
||||||
struct arguments args = {false, false, false, 0, "", "-", "-", "-",
|
struct arguments args = {false, false, false, 0, "", "-", "-", "6M", "-",
|
||||||
false, false, false, false, true, false};
|
false, false, false, false, true, false};
|
||||||
/* parse arguments */
|
/* parse arguments */
|
||||||
argp_parse(&argp, argc, argv, 0, 0, &args);
|
argp_parse(&argp, argc, argv, 0, 0, &args);
|
||||||
|
|
@ -127,12 +129,39 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
cable = select_cable->second;
|
cable = select_cable->second;
|
||||||
|
|
||||||
|
uint32_t speed;
|
||||||
|
try {
|
||||||
|
size_t end;
|
||||||
|
float speed_base = stof(args.speed, &end);
|
||||||
|
if (end == args.speed.size()) {
|
||||||
|
speed = (uint32_t)speed_base;
|
||||||
|
} else if (end == (args.speed.size() - 1)) {
|
||||||
|
switch (args.speed.back()) {
|
||||||
|
case 'k': case 'K':
|
||||||
|
speed = (uint32_t)(1e3 * speed_base);
|
||||||
|
break;
|
||||||
|
case 'm': case 'M':
|
||||||
|
speed = (uint32_t)(1e6 * speed_base);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
cerr << "error : speed: invaild postfix \"" << args.speed.back() << "\"" << endl;
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
cerr << "error : speed: invaild postfix \"" << args.speed.substr(end) << "\"" << endl;
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
} catch (...) {
|
||||||
|
cerr << "error : speed: invaild format" << endl;
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
/* jtag base */
|
/* jtag base */
|
||||||
Jtag *jtag;
|
Jtag *jtag;
|
||||||
if (args.device == "-")
|
if (args.device == "-")
|
||||||
jtag = new Jtag(cable, pins_config, 6000000, false);
|
jtag = new Jtag(cable, pins_config, speed, false);
|
||||||
else
|
else
|
||||||
jtag = new Jtag(cable, pins_config, args.device, 6000000, false);
|
jtag = new Jtag(cable, pins_config, args.device, speed, false);
|
||||||
|
|
||||||
/* chain detection */
|
/* chain detection */
|
||||||
vector<int> listDev;
|
vector<int> listDev;
|
||||||
|
|
@ -235,6 +264,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
|
||||||
case 'b':
|
case 'b':
|
||||||
arguments->board = arg;
|
arguments->board = arg;
|
||||||
break;
|
break;
|
||||||
|
case 's':
|
||||||
|
arguments->speed = arg;
|
||||||
|
break;
|
||||||
case ARGP_KEY_ARG:
|
case ARGP_KEY_ARG:
|
||||||
arguments->bit_file = arg;
|
arguments->bit_file = arg;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue