diff --git a/src/mainboard/google/brox/variants/baseboard/brox/romstage.c b/src/mainboard/google/brox/variants/baseboard/brox/romstage.c index 66ed99b9f4..6a03a9ae46 100644 --- a/src/mainboard/google/brox/variants/baseboard/brox/romstage.c +++ b/src/mainboard/google/brox/variants/baseboard/brox/romstage.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -53,9 +54,14 @@ static bool check_auxfw_ver_mismatch(void) bool mainboard_expects_another_reset(void) { + /* Do not change the order of the check in this function */ if (vboot_recovery_mode_enabled()) return false; + /* If CSE is booting from RO, CSE state switch will issue a reset anyway. */ + if (!is_cse_boot_to_rw()) + return true; + if (!CONFIG(VBOOT) || (vboot_is_gbb_flag_set(VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) && vboot_is_gbb_flag_set(VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC)))