Revert "ec_sync: Only do aux fw update if also doing EC update"

This reverts commit f5df3b0a6d1788c663f39d94d8a2f3ceba9dd3e5.

Attempt anx3429 update without EC software sync happening.

BUG=b:74336712
BRANCH=eve
TEST=manual

Change-Id: Icae986242bf0b96f11b3decea77f9565d7cb2d10
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/1338371
diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c
index f5ceb11..eaedd9d 100644
--- a/firmware/lib/ec_sync.c
+++ b/firmware/lib/ec_sync.c
@@ -449,11 +449,8 @@
 			       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 45da682..0972715 100644
--- a/firmware/lib/ec_sync_all.c
+++ b/firmware/lib/ec_sync_all.c
@@ -46,19 +46,12 @@
 	VbAuxFwUpdateSeverity_t fw_update;
 	VbError_t rv;
 
+	rv = ec_sync_check_aux_fw(ctx, cparams, &fw_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);
-
-	/*
-	 * 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;
-	}
-
 	int need_wait_screen = ec_will_update_slowly(ctx, cparams) ||
 		(fw_update == VB_AUX_FW_SLOW_UPDATE);