summaryrefslogtreecommitdiff
path: root/futility/updater_manifest.c
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2023-02-10 15:51:10 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-02-12 10:37:45 +0000
commit69b054e3276806a2fa86b4894d5f5d90912e1ef9 (patch)
tree1e2e5e72cb385fe06d5ccfb69c6baaf8f05452c2 /futility/updater_manifest.c
parentf54957b9af441b5a2ba65894335aacd95de87e78 (diff)
downloadvboot-69b054e3276806a2fa86b4894d5f5d90912e1ef9.tar.gz
futility: updater: refactor: always pass updater config to DUT APIs
To support local and remote DUTs, we need to always pass the updater configuration (including flash programmer information) for DUT related calls. No functional changes but this is required for DUT detection in the future. BUG=b:247428499,b:255617349 TEST=make; run test BRANCH=None Change-Id: I91bdc95f3073d1e94030246790db83645fbd63ac Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4235306 Auto-Submit: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org>
Diffstat (limited to 'futility/updater_manifest.c')
-rw-r--r--futility/updater_manifest.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/futility/updater_manifest.c b/futility/updater_manifest.c
index 6d7d9d41..96faa6c4 100644
--- a/futility/updater_manifest.c
+++ b/futility/updater_manifest.c
@@ -620,7 +620,8 @@ static int manifest_from_simple_folder(struct manifest *manifest)
* system (as defined by model_name).
* Returns a model_config from manifest, or NULL if not found.
*/
-const struct model_config *manifest_find_model(const struct manifest *manifest,
+const struct model_config *manifest_find_model(struct updater_config *cfg,
+ const struct manifest *manifest,
const char *model_name)
{
char *manifest_key = NULL;
@@ -637,7 +638,7 @@ const struct model_config *manifest_find_model(const struct manifest *manifest,
return &manifest->models[0];
if (!model_name) {
- matched_index = dut_get_manifest_key(&manifest_key);
+ matched_index = dut_get_manifest_key(&manifest_key, cfg);
if (matched_index < 0) {
ERROR("Failed to get device identity. "
"Run \"crosid -v\" for explanation.\n");