Revert "vboot_logic: Set VB2_CONTEXT_EC_TRUSTED in verstage_main"

This reverts commit 6260bf712a836762b18d80082505e981e040f4bc.

Reason for revert: This CL did not handle Intel GPIO correctly. We need
to add GPIO_EC_IN_RW into early_gpio_table for platforms using Intel
SoC.

Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org>
Change-Id: Iaeb1bf598047160f01e33ad0d9d004cad59e3f75
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57951
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

51 files changed, 0 insertions, 322 deletions

diff --git a/src/include/bootmode.h b/src/include/bootmode.h
index da2dbf6565..aadecba334 100644
--- a/src/include/bootmode.h
+++ b/src/include/bootmode.h
@@ -11,7 +11,6 @@ int get_recovery_mode_retrain_switch(void);
 int clear_recovery_mode_switch(void);
 int get_wipeout_mode_switch(void);
 int get_lid_switch(void);
-int get_ec_is_trusted(void);
 
 /* Return 1 if display initialization is required. 0 if not. */
 int display_init_required(void);
diff --git a/src/mainboard/google/asurada/chromeos.c b/src/mainboard/google/asurada/chromeos.c
index 1aa8876ca4..6f8f24281a 100644
--- a/src/mainboard/google/asurada/chromeos.c
+++ b/src/mainboard/google/asurada/chromeos.c
@@ -40,9 +40,3 @@ int tis_plat_irq_status(void)
 {
 	return gpio_eint_poll(GPIO_H1_AP_INT);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. This is active low. */
-	return !!gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index f449c9cf7f..50eeddce0a 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -8,13 +8,6 @@
 /* SPI Write protect is GPIO 16 */
 #define CROS_WP_GPIO	58
 
-/* EC_IN_RW is GPIO 25 in samus and 14 otherwise */
-#if CONFIG(BOARD_GOOGLE_SAMUS)
-#define EC_IN_RW_GPIO	25
-#else
-#define EC_IN_RW_GPIO	14
-#endif
-
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 	struct lb_gpio chromeos_gpios[] = {
@@ -39,9 +32,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !get_gpio(EC_IN_RW_GPIO);
-}
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 5c49649ef4..a33caca37a 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -65,10 +65,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/brya/chromeos.c b/src/mainboard/google/brya/chromeos.c
index 184cd52104..add73464da 100644
--- a/src/mainboard/google/brya/chromeos.c
+++ b/src/mainboard/google/brya/chromeos.c
@@ -29,9 +29,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 960dd87990..356e97b7b5 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -77,10 +77,3 @@ void mainboard_chromeos_acpi_generate(void)
 
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/cherry/chromeos.c b/src/mainboard/google/cherry/chromeos.c
index 13b673cf07..748e06e28d 100644
--- a/src/mainboard/google/cherry/chromeos.c
+++ b/src/mainboard/google/cherry/chromeos.c
@@ -59,9 +59,3 @@ int tis_plat_irq_status(void)
 {
 	return gpio_eint_poll(GPIO_GSC_AP_INT);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. This is active low. */
-	return !!gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 4a48aeb78b..b88862ca59 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -12,8 +12,6 @@
 
 #define WP_GPIO			GP_E_22
 
-#define EC_IN_RW_GPIO		GP_SW_77
-
 #define ACTIVE_LOW	0
 #define ACTIVE_HIGH	1
 
@@ -64,9 +62,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(EC_IN_RW_GPIO);
-}
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index 9cb57f869e..7599295f1f 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -37,9 +37,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get_value(GPIO_D16);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get_value(GPIO_D17);
-}
diff --git a/src/mainboard/google/dedede/chromeos.c b/src/mainboard/google/dedede/chromeos.c
index 6be765244d..fb904cca83 100644
--- a/src/mainboard/google/dedede/chromeos.c
+++ b/src/mainboard/google/dedede/chromeos.c
@@ -30,9 +30,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/deltaur/chromeos.c b/src/mainboard/google/deltaur/chromeos.c
index b2c34a2161..9d3929e1df 100644
--- a/src/mainboard/google/deltaur/chromeos.c
+++ b/src/mainboard/google/deltaur/chromeos.c
@@ -111,10 +111,3 @@ void mainboard_prepare_cr50_reset(void)
 	if (ENV_RAMSTAGE)
 		pmc_soc_set_afterg3_en(true);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/drallion/chromeos.c b/src/mainboard/google/drallion/chromeos.c
index 607f7c3d99..d92ebb133d 100644
--- a/src/mainboard/google/drallion/chromeos.c
+++ b/src/mainboard/google/drallion/chromeos.c
@@ -110,10 +110,3 @@ void mainboard_prepare_cr50_reset(void)
 	pmc_soc_set_afterg3_en(true);
 #endif
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/eve/chromeos.c b/src/mainboard/google/eve/chromeos.c
index 10a837d58e..11931c676d 100644
--- a/src/mainboard/google/eve/chromeos.c
+++ b/src/mainboard/google/eve/chromeos.c
@@ -34,9 +34,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/fizz/chromeos.c b/src/mainboard/google/fizz/chromeos.c
index 593982beed..a74c2f7091 100644
--- a/src/mainboard/google/fizz/chromeos.c
+++ b/src/mainboard/google/fizz/chromeos.c
@@ -34,9 +34,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 8ed41cd2a5..38d12cb696 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -26,10 +26,3 @@ int get_write_protect_state(void)
 {
 	return 0;
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index ac464b4c89..4674581da8 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -157,10 +157,3 @@ int get_write_protect_state(void)
 {
 	return !read_gpio(get_wp_status_gpio_pin());
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 70b4f641cd..6a1f0b4358 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -33,9 +33,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/gru/chromeos.c b/src/mainboard/google/gru/chromeos.c
index 479ca3d85d..688c0dd27a 100644
--- a/src/mainboard/google/gru/chromeos.c
+++ b/src/mainboard/google/gru/chromeos.c
@@ -49,9 +49,3 @@ int tis_plat_irq_status(void)
 	return gpio_irq_status(GPIO_TPM_IRQ);
 }
 #endif
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/guybrush/chromeos.c b/src/mainboard/google/guybrush/chromeos.c
index a43b3032bb..df99e6434b 100644
--- a/src/mainboard/google/guybrush/chromeos.c
+++ b/src/mainboard/google/guybrush/chromeos.c
@@ -27,17 +27,6 @@ void mainboard_chromeos_acpi_generate(void)
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
 
-int get_ec_is_trusted(void)
-{
-	/* Board versions 1 & 2 support H1 DB, but the EC_IN_RW signal is not
-	   routed. So emulate EC is trusted. */
-	if (CONFIG(BOARD_GOOGLE_GUYBRUSH) &&
-	    (board_id() == UNDEFINED_STRAPPING_ID || board_id() < 3))
-		return 1;
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
-
 void mainboard_spi_fast_speed_override(uint8_t *fast_speed)
 {
 	uint32_t board_ver = board_id();
diff --git a/src/mainboard/google/hatch/chromeos.c b/src/mainboard/google/hatch/chromeos.c
index 400a3fa044..ee54ade334 100644
--- a/src/mainboard/google/hatch/chromeos.c
+++ b/src/mainboard/google/hatch/chromeos.c
@@ -34,9 +34,3 @@ void mainboard_chromeos_acpi_generate(void)
 
 	chromeos_acpi_gpio_generate(cros_gpios, num_gpios);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/herobrine/chromeos.c b/src/mainboard/google/herobrine/chromeos.c
index 9faf4baf5f..a11667586b 100644
--- a/src/mainboard/google/herobrine/chromeos.c
+++ b/src/mainboard/google/herobrine/chromeos.c
@@ -24,9 +24,3 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 
 	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Stub GPIO. */
-	return 0;
-}
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index bc00994a44..cf59636073 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -67,10 +67,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/kahlee/chromeos.c b/src/mainboard/google/kahlee/chromeos.c
index 1f81f222a7..b85f976890 100644
--- a/src/mainboard/google/kahlee/chromeos.c
+++ b/src/mainboard/google/kahlee/chromeos.c
@@ -32,9 +32,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/kukui/chromeos.c b/src/mainboard/google/kukui/chromeos.c
index 4c4a8bec03..3f15a3fb91 100644
--- a/src/mainboard/google/kukui/chromeos.c
+++ b/src/mainboard/google/kukui/chromeos.c
@@ -37,9 +37,3 @@ int tis_plat_irq_status(void)
 {
 	return gpio_eint_poll(CR50_IRQ);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(EC_IN_RW);
-}
diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index ce9a33dd0c..540803ca1a 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -6,8 +6,6 @@
 #include <southbridge/intel/common/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
-#define GPIO_EC_IN_RW 21
-
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 	struct lb_gpio chromeos_gpios[] = {
@@ -39,9 +37,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !get_gpio(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/mistral/chromeos.c b/src/mainboard/google/mistral/chromeos.c
index 171a8ee6bd..c827c7d13d 100644
--- a/src/mainboard/google/mistral/chromeos.c
+++ b/src/mainboard/google/mistral/chromeos.c
@@ -1,16 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <boot/coreboot_tables.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index 9aaad2f191..7fe877bff0 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -19,9 +19,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO(R1));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO(U4));
-}
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index 9aaad2f191..7fe877bff0 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -19,9 +19,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO(R1));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO(U4));
-}
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index 9aaad2f191..7fe877bff0 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -19,9 +19,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO(R1));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO(U4));
-}
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index 739df2e25b..9e7af27382 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -34,9 +34,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(WRITE_PROTECT);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(EC_IN_RW);
-}
diff --git a/src/mainboard/google/octopus/chromeos.c b/src/mainboard/google/octopus/chromeos.c
index 4a7f040c47..03d3b4f0fa 100644
--- a/src/mainboard/google/octopus/chromeos.c
+++ b/src/mainboard/google/octopus/chromeos.c
@@ -33,9 +33,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index 346fe76aa9..03b0d476f3 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -68,10 +68,3 @@ void mainboard_chromeos_acpi_generate(void)
 
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index 3d4f51cb21..ebbfdd3cb4 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -37,9 +37,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get_value(GPIO_X30);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get_value(GPIO_X23);
-}
diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index 35a9323e16..5dd1e9877e 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.c
@@ -38,9 +38,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index edc714eff5..f9a171820d 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -8,9 +8,6 @@
 /* The WP status pin lives on GPIO_SSUS_6 which is pad 36 in the SUS well. */
 #define WP_STATUS_PAD	36
 
-/* The EC_IN_RW lives on SCGPIO59 */
-#define EC_IN_RW_PAD	59
-
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 	struct lb_gpio chromeos_gpios[] = {
@@ -46,9 +43,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !score_get_gpio(EC_IN_RW_PAD);
-}
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index f87d9358e3..94d76b99e4 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -33,9 +33,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index 36825b5dd7..f49b63964f 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -107,10 +107,3 @@ void mainboard_prepare_cr50_reset(void)
 	if (ENV_RAMSTAGE)
 		pmc_soc_set_afterg3_en(true);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index 11d41cd441..4fffd45b35 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -30,9 +30,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !get_gpio(14);
-}
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index d74df8267e..13a69bc0ed 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -19,9 +19,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(WRITE_PROTECT_L);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(EC_IN_RW);
-}
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index 51a0c5c09e..21cf94f978 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -128,10 +128,3 @@ int get_write_protect_state(void)
 {
 	return !read_gpio(WP_SW);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/trogdor/chromeos.c b/src/mainboard/google/trogdor/chromeos.c
index 718df331f4..9006000191 100644
--- a/src/mainboard/google/trogdor/chromeos.c
+++ b/src/mainboard/google/trogdor/chromeos.c
@@ -55,9 +55,3 @@ int tis_plat_irq_status(void)
 {
 	return gpio_irq_status(GPIO_H1_AP_INT);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. This is active low. */
-	return !!gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 411b14e1f7..b99df04c14 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -56,9 +56,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO_WP);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_ECINRW);
-}
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index f3587a3eed..a3ba7529ba 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -34,10 +34,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO_WP);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index 33f0ee45fc..95158bf9ee 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -43,10 +43,3 @@ int get_write_protect_state(void)
 {
 	return !gpio_get(GPIO_WP);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* Do not have a Chrome EC involved in entering recovery mode;
-	   Always return trusted. */
-	return 1;
-}
diff --git a/src/mainboard/google/volteer/chromeos.c b/src/mainboard/google/volteer/chromeos.c
index cdf418d394..abd50c57ba 100644
--- a/src/mainboard/google/volteer/chromeos.c
+++ b/src/mainboard/google/volteer/chromeos.c
@@ -32,9 +32,3 @@ void mainboard_chromeos_acpi_generate(void)
 	gpios = variant_cros_gpios(&num);
 	chromeos_acpi_gpio_generate(gpios, num);
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/mainboard/google/zork/chromeos.c b/src/mainboard/google/zork/chromeos.c
index 3c60f9816e..b581b90d1a 100644
--- a/src/mainboard/google/zork/chromeos.c
+++ b/src/mainboard/google/zork/chromeos.c
@@ -31,9 +31,3 @@ void mainboard_chromeos_acpi_generate(void)
 {
 	chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios));
 }
-
-int get_ec_is_trusted(void)
-{
-	/* EC is trusted if not in RW. */
-	return !gpio_get(GPIO_EC_IN_RW);
-}
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 3c50e4ef83..6c051093ea 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -57,16 +57,6 @@ int __weak get_recovery_mode_retrain_switch(void)
 	return 0;
 }
 
-int __weak get_ec_is_trusted(void)
-{
-	/*
-	 * If board doesn't override this, by default we always assume EC is in
-	 * RW and untrusted. However, newer platforms are supposed to use cr50
-	 * BOOT_MODE to report this and won't need to override this anymore.
-	 */
-	return 0;
-}
-
 #if CONFIG(VBOOT_NO_BOARD_SUPPORT)
 /**
  * TODO: Create flash protection interface which implements get_write_protect_state.
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index 91d42b2c7f..2973934b99 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -306,9 +306,6 @@ void verstage_main(void)
 	if (CONFIG(TPM_CR50))
 		check_boot_mode(ctx);
 
-	if (get_ec_is_trusted())
-		ctx->flags |= VB2_CONTEXT_EC_TRUSTED;
-
 	/* Do early init (set up secdata and NVRAM, load GBB) */
 	printk(BIOS_INFO, "Phase 1\n");
 	rv = vb2api_fw_phase1(ctx);
diff --git a/src/soc/intel/alderlake/Makefile.inc b/src/soc/intel/alderlake/Makefile.inc
index 1c578f215c..c7e0abc492 100644
--- a/src/soc/intel/alderlake/Makefile.inc
+++ b/src/soc/intel/alderlake/Makefile.inc
@@ -46,8 +46,6 @@ ramstage-y += vr_config.c
 ramstage-y += xhci.c
 ramstage-$(CONFIG_SOC_INTEL_CRASHLOG) += crashlog.c
 
-verstage-y += gpio.c
-
 smm-y += elog.c
 smm-y += gpio.c
 smm-y += p2sb.c
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 3b17607a18..49707da1a6 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -92,13 +92,11 @@ bootblock-y += gpio_glk.c
 romstage-y += gpio_glk.c
 smm-y += gpio_glk.c
 ramstage-y += gpio_glk.c
-verstage-y += gpio_glk.c
 else
 bootblock-y += gpio_apl.c
 romstage-y += gpio_apl.c
 smm-y += gpio_apl.c
 ramstage-y += gpio_apl.c
-verstage-y += gpio_apl.c
 endif
 
 CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 51700b3706..c191aac607 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -20,7 +20,6 @@ bootblock-y += spi.c
 bootblock-y += lpc.c
 bootblock-y += uart.c
 
-verstage-y += gpio.c
 verstage-y += gspi.c
 verstage-y += pmutil.c
 verstage-y += i2c.c