From 14025bd5cc0fdfc45be6a767c0c424dcf56b4d08 Mon Sep 17 00:00:00 2001
From: Tim Wawrzynczak <twawrzynczak@chromium.org>
Date: Fri, 21 Aug 2020 13:43:59 -0600
Subject: mb/google/volteer: Enable CSE Board Reset Override

This will ensure that the cold reset is performed when CSE Lite jumps
from RO to RW.

BUG=b:162977697
TEST=Verify CSE reset is cold (sits in S5 for PCH Min Slp Duration time)

Change-Id: Ib1173e219ba46ee3275824220c8cf790b1d497fa
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44684
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
---
 src/mainboard/google/volteer/Kconfig     | 1 +
 src/mainboard/google/volteer/mainboard.c | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/mainboard/google/volteer')

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index baa71cb95a..4867feaabe 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -33,6 +33,7 @@ if BOARD_GOOGLE_BASEBOARD_VOLTEER
 config CHROMEOS
 	bool
 	default y
+	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE if SOC_INTEL_CSE_LITE_SKU
 	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/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index a926673ad7..5bece68c1c 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -5,19 +5,10 @@
 #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 <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <variant/gpio.h>
 
-void cse_board_reset(void)
-{
-	if (!google_chromeec_ap_reset())
-		halt();
-}
-
 static void mainboard_init(struct device *dev)
 {
 	mainboard_ec_init();
-- 
cgit v1.2.3