diff options
Diffstat (limited to 'cli_classic.c')
| -rw-r--r-- | cli_classic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cli_classic.c b/cli_classic.c index 4537e1ecf..158110b9a 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -172,7 +172,6 @@ int main(int argc, char *argv[]) int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; struct flashrom_layout *layout = NULL; - // enum programmer prog = PROGRAMMER_INVALID; static const struct programmer_entry *prog = NULL; enum { OPTION_IFD = 0x0100, @@ -544,12 +543,14 @@ int main(int argc, char *argv[]) } if (prog == NULL) { - if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { - prog = programmer_table[CONFIG_DEFAULT_PROGRAMMER]; + const struct programmer_entry *const default_programmer = CONFIG_DEFAULT_PROGRAMMER_NAME; + + if (default_programmer) { + prog = default_programmer; /* We need to strdup here because we free(pparam) unconditionally later. */ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", - programmer_table[CONFIG_DEFAULT_PROGRAMMER]->name, pparam); + default_programmer->name, pparam); } else { msg_perr("Please select a programmer with the --programmer parameter.\n" #if CONFIG_INTERNAL == 1 |