Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44645 )
Change subject: mb/google/dedede: Enable CSE Board Reset Override ......................................................................
mb/google/dedede: Enable CSE Board Reset Override
This will ensure that the cold reset is performed when CSE Lite jumps from RO to RW.
BUG=b:162386991 TEST=Ensure that Drawcia board boots to OS. Ensure that global reset is triggered when cr50 is running firmware versions newer than 0.0.22. On cr50 versions 0.0.22 or older, EC triggers cold reset of AP.
Change-Id: I46a390c71e380328cd7fe70214df09553b2db75c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/44645 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/mainboard.c 2 files changed, 1 insertion(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index d4c4d06..dd1125e 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -31,6 +31,7 @@ config CHROMEOS bool default y + select CHROMEOS_CSE_BOARD_RESET_OVERRIDE select EC_GOOGLE_CHROMEEC_SWITCHES select GBB_FLAG_FORCE_DEV_SWITCH_ON select GBB_FLAG_FORCE_DEV_BOOT_USB diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index 4695a9f..cb84e1f 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -5,18 +5,8 @@ #include <baseboard/variants.h> #include <device/device.h> #include <ec/ec.h> -#include <ec/google/chromeec/ec.h> -#include <halt.h> -#include <intelblocks/cse.h> #include <vendorcode/google/chromeos/chromeos.h>
-void cse_board_reset(void) -{ - /* TODO: Check tpm firmware version before initiating AP reset. */ - if (!google_chromeec_ap_reset()) - halt(); -} - __weak void variant_isst_override(void) { /*