diff options
| author | Randall Spangler <rspangler@chromium.org> | 2018-01-02 12:32:16 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-09 14:14:16 -0800 |
| commit | 39427240693b31942f89385d3b01083fea1b0678 (patch) | |
| tree | e1a8dad5e269bd8f6b1530ab307841b486957b47 /firmware/lib/ec_sync_all.c | |
| parent | 46b7e0dae409ad83797a0b2feff314417bbb7b1c (diff) | |
| download | vboot-39427240693b31942f89385d3b01083fea1b0678.tar.gz | |
ec_sync: Use vboot2 context instead of cparams
Copy sync-related flags from cparams / vboot1 shared data to the
equivalent vboot2 structs. This removes the need for ec_sync to
access the old structs, which are on their way out.
No change in functionality.
BUG=chromium:611535
BRANCH=none
TEST=make -j runtests; build bob firmware and boot it
Change-Id: I50ee76cf275a7fba894c2ec2c3dd83b9a8d91b53
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/852489
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'firmware/lib/ec_sync_all.c')
| -rw-r--r-- | firmware/lib/ec_sync_all.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c index 1d9c7f71..a756bbcf 100644 --- a/firmware/lib/ec_sync_all.c +++ b/firmware/lib/ec_sync_all.c @@ -24,13 +24,13 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) VbAuxFwUpdateSeverity_t fw_update; VbError_t rv; - rv = ec_sync_check_aux_fw(ctx, cparams, &fw_update); + rv = ec_sync_check_aux_fw(ctx, &fw_update); if (rv) return rv; /* Phase 1; this determines if we need an update */ - VbError_t phase1_rv = ec_sync_phase1(ctx, cparams); - int need_wait_screen = ec_will_update_slowly(ctx, cparams) || + VbError_t phase1_rv = ec_sync_phase1(ctx); + int need_wait_screen = ec_will_update_slowly(ctx) || (fw_update == VB_AUX_FW_SLOW_UPDATE); /* @@ -61,7 +61,7 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) } /* Phase 2; Applies update and/or jumps to the correct EC image */ - rv = ec_sync_phase2(ctx, cparams); + rv = ec_sync_phase2(ctx); if (rv) return rv; @@ -89,7 +89,7 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) } /* Phase 3; Completes sync and handles battery cutoff */ - rv = ec_sync_phase3(ctx, cparams); + rv = ec_sync_phase3(ctx); if (rv) return rv; |