summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ec/google/chromeec/switches.c8
-rw-r--r--src/security/vboot/Kconfig4
-rw-r--r--src/security/vboot/Makefile.inc1
3 files changed, 3 insertions, 10 deletions
diff --git a/src/ec/google/chromeec/switches.c b/src/ec/google/chromeec/switches.c
index 7b3f4d4cf1..3fd38084f6 100644
--- a/src/ec/google/chromeec/switches.c
+++ b/src/ec/google/chromeec/switches.c
@@ -34,10 +34,9 @@ int get_recovery_mode_switch(void)
(google_chromeec_get_switches() & EC_SWITCH_DEDICATED_RECOVERY))
return 1;
- /* Check if the EC has posted the keyboard recovery/fastboot event. */
+ /* Check if the EC has posted the keyboard recovery event. */
return !!(google_chromeec_get_events_b() &
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY) |
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_FASTBOOT)));
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
}
int get_recovery_mode_retrain_switch(void)
@@ -68,6 +67,5 @@ int clear_recovery_mode_switch(void)
/* Clear all host event bits requesting recovery mode. */
return google_chromeec_clear_events_b(
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY) |
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT) |
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_FASTBOOT));
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT));
}
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index c5146c61e7..1e372d86ba 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -286,10 +286,6 @@ config GBB_FLAG_DISABLE_LID_SHUTDOWN
bool "Disable shutdown on closed lid"
default n
-config GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP
- bool "Allow fastboot even if dev_boot_fastboot_full_cap=0"
- default n
-
config GBB_FLAG_FORCE_MANUAL_RECOVERY
bool "Always assume manual recovery in recovery mode"
default n
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index d554f103d6..3078e30e21 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -220,7 +220,6 @@ GBB_FLAGS := $(call int-add, \
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY),0x400) \
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC),0x800) \
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_LID_SHUTDOWN),0x1000) \
- $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP),0x2000) \
$(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_MANUAL_RECOVERY),0x4000) \
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FWMP),0x8000) \
)