summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2021-11-23 11:00:14 +1100
committerCommit Bot <commit-bot@chromium.org>2021-11-24 07:37:38 +0000
commitc2d0cc1d30103e9a9b62db03a88489ef47fca619 (patch)
tree7ce98986db8523d4b8ae340cd4b9326dc5f1f0fb
parent0457e74c956b320e1ed24fee469f951521a3e18a (diff)
downloadvboot-c2d0cc1d30103e9a9b62db03a88489ef47fca619.tar.gz
futility: updater_setup_config() allow for non-host prog
Allow for specifying the 'dummy' programmer within tests over directly using the host native programmer by ignoring the specified programmer in the case of output mode for the purpose of checking whether EC/PD images are being used. BUG=b:203715651 BRANCH=none TEST=builds Signed-off-by: Edward O'Callaghan <quasisec@google.com> Change-Id: I8d3910569eed4ba9259012dbc05028d9f8dba8a3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3295888 Tested-by: Edward O'Callaghan <quasisec@chromium.org> Auto-Submit: Edward O'Callaghan <quasisec@chromium.org> Commit-Queue: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Sam McNally <sammc@chromium.org>
-rw-r--r--futility/updater.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/futility/updater.c b/futility/updater.c
index e8fd84e2..7bc369a2 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1622,7 +1622,7 @@ int updater_setup_config(struct updater_config *cfg,
errorcnt += !!setup_config_quirks(arg->quirks, cfg);
/* Additional checks. */
- if (check_single_image && (cfg->ec_image.data || cfg->pd_image.data)) {
+ if (check_single_image && !do_output && (cfg->ec_image.data || cfg->pd_image.data)) {
errorcnt++;
ERROR("EC/PD images are not supported in current mode.\n");
}