2 files changed, 10 insertions, 3 deletions
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index cfebc6b567..8277875e33 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -16,10 +16,15 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_INTEL_TIGERLAKE
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select DRIVERS_INTEL_ISH
+	select EC_ACPI
 
 config CHROMEOS
 	bool
 	default y
+	select EC_GOOGLE_CHROMEEC_SWITCHES if TGL_CHROME_EC
+	select GBB_FLAG_FORCE_MANUAL_RECOVERY
+	select HAS_RECOVERY_MRC_CACHE
+	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
 
@@ -68,9 +73,9 @@ choice TGL_EC
 config TGL_CHROME_EC
 	bool "Chrome EC"
 	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_LPC
 	select EC_GOOGLE_CHROMEEC_ESPI
 	select EC_GOOGLE_CHROMEEC_BOARDID
-	select EC_ACPI
 
 config TGL_INTEL_EC
 	bool "Intel EC"
@@ -81,8 +86,6 @@ endchoice
 config VBOOT
 	select VBOOT_LID_SWITCH
 	select VBOOT_MOCK_SECDATA
-	select HAS_RECOVERY_MRC_CACHE
-	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
 
 config UART_FOR_CONSOLE
 	int
diff --git a/src/mainboard/intel/tglrvp/chromeos.c b/src/mainboard/intel/tglrvp/chromeos.c
index 70a92f2f09..7da61be1b0 100644
--- a/src/mainboard/intel/tglrvp/chromeos.c
+++ b/src/mainboard/intel/tglrvp/chromeos.c
@@ -12,10 +12,12 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 		{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
 		{-1, ACTIVE_HIGH, 0, "power"},
 		{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
+		{-1, ACTIVE_HIGH, 0, "EC in RW"},
 	};
 	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
 
+#if !CONFIG(EC_GOOGLE_CHROMEEC_SWITCHES)
 int get_lid_switch(void)
 {
 	/* Lid always open */
@@ -27,6 +29,8 @@ int get_recovery_mode_switch(void)
 	return 0;
 }
 
+#endif /*!CONFIG(EC_GOOGLE_CHROMEEC_SWITCHES) */
+
 int get_write_protect_state(void)
 {
 	/* No write protect */