diff options
| -rw-r--r-- | firmware/lib/ec_sync.c | 3 | ||||
| -rw-r--r-- | firmware/lib/ec_sync_all.c | 15 |
2 files changed, 4 insertions, 14 deletions
diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index f5ceb110..eaedd9d3 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -449,11 +449,8 @@ VbError_t ec_sync_check_aux_fw(struct vb2_context *ctx, VbCommonParams *cparams, VbAuxFwUpdateSeverity_t *severity) { - struct vb2_shared_data *sd = vb2_get_sd(ctx); - /* If we're not updating the EC, skip aux fw syncs as well */ if (!ec_sync_allowed(ctx, cparams) || - !(sd->flags & VB2_SD_FLAG_ECSYNC_EC_RW) || (cparams->gbb->flags & GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC)) { *severity = VB_AUX_FW_NO_UPDATE; return VBERROR_SUCCESS; diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c index 45da682b..09727152 100644 --- a/firmware/lib/ec_sync_all.c +++ b/firmware/lib/ec_sync_all.c @@ -46,19 +46,12 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams) VbAuxFwUpdateSeverity_t fw_update; VbError_t rv; - /* Do EC sync phase 1; this determines if we need an update */ - VbError_t phase1_rv = ec_sync_phase1(ctx, cparams); - - /* - * Check for AUX firmware updates to be performed. - * Continue on errors to prevent reboot loop on persistent failure. - */ rv = ec_sync_check_aux_fw(ctx, cparams, &fw_update); - if (rv) { - VB2_DEBUG("Skipping AUX FW update.\n"); - fw_update = VB_AUX_FW_NO_UPDATE; - } + if (rv) + return rv; + /* Do EC sync 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) || (fw_update == VB_AUX_FW_SLOW_UPDATE); |