diff options
| -rw-r--r-- | futility/updater.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/futility/updater.c b/futility/updater.c index b08e70ad..362d5dfc 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -1437,11 +1437,6 @@ int updater_setup_config(struct updater_config *cfg, if (arg->force_update) cfg->force_update = 1; - /* Identify DUT type. Currently only local/remote (via servo). */ - cfg->dut_is_remote = arg->use_flash; - if (cfg->dut_is_remote) - INFO("Configured to update a remote DUT via Servo.\n"); - /* Check incompatible options and return early. */ if (arg->do_manifest) { if (!!arg->archive == !!arg->image) { @@ -1504,8 +1499,12 @@ int updater_setup_config(struct updater_config *cfg, cfg->override_gbb_flags = arg->override_gbb_flags; /* Setup properties and fields that do not have external dependency. */ - if (arg->programmer) { + if (arg->programmer && strcmp(arg->programmer, cfg->image.programmer)) { check_single_image = 1; + /* DUT should be remote if the programmer is changed. */ + cfg->dut_is_remote = 1; + INFO("Configured to update a remote DUT%s.\n", + arg->detect_servo ? " via Servo" : ""); cfg->image.programmer = arg->programmer; cfg->image_current.programmer = arg->programmer; cfg->original_programmer = arg->programmer; |