Revert "TROGDOR-ONLY: HACK: Skip auxfw sync"
This reverts commit e6d7a3422431868e7538b809cf0d9cc863fa0245.
Reason for revert: CL:5067754 fixes the bug so we can revert this
mitigation and let devices update their TCPCs again.
Original change's description:
> TROGDOR-ONLY: HACK: Skip auxfw sync
>
> In order to allow us to resume system updates on certain Trogdor devices
> that are currently suffering from a bad TCPC update bug which is still
> under investigation, where different users are currently stuck on
> different versions and we are worried that any further update attempts
> with the current code could lead to more bricks, we are completely
> disabling TCPC sync until we have managed to identify the root cause and
> find a proper fix for this issue.
>
> BRANCH=trogdor
> BUG=b:304772621
> TEST=Booted CoachZ
>
> Change-Id: Ia2f0d42404d709fa6cd77820feef870474cc14c1
> Signed-off-by: Julius Werner <jwerner@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5008876
> Reviewed-by: Wai-Hong Tam <waihong@google.com>
> Reviewed-by: Bob Moragues <moragues@chromium.org>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
> Commit-Queue: Bob Moragues <moragues@chromium.org>
> Tested-by: Bob Moragues <moragues@chromium.org>
BUG=b:304772621
Change-Id: I33cfb2a09fbe5e801ed28357e6fdc550503b4188
Cq-Depend: chromium:5067754
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/5068492
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>
diff --git a/firmware/2lib/2auxfw_sync.c b/firmware/2lib/2auxfw_sync.c
index 013c92d..eaea1d4 100644
--- a/firmware/2lib/2auxfw_sync.c
+++ b/firmware/2lib/2auxfw_sync.c
@@ -52,9 +52,6 @@
{
enum vb2_auxfw_update_severity fw_update = VB2_AUXFW_NO_UPDATE;
- VB2_DEBUG("TROGDOR HACK: Skipping auxfw sync\n");
- goto skip;
-
/* Check for update severity */
VB2_TRY(auxfw_sync_check_update(ctx, &fw_update));
@@ -69,6 +66,5 @@
return VB2_REQUEST_REBOOT_EC_TO_RO;
}
-skip:
return vb2ex_auxfw_finalize(ctx);
}
