Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
vboot: remove fastboot support
BUG=b:124141368, chromium:995172 TEST=make clean && make test-abuild BRANCH=none
Change-Id: I06ea816ffb910163ec2c3c456b3c09408c806d0b Signed-off-by: Joel Kitching kitching@google.com --- M src/ec/google/chromeec/switches.c M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 3 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/35002/1
diff --git a/src/ec/google/chromeec/switches.c b/src/ec/google/chromeec/switches.c index 7b3f4d4..3fd3808 100644 --- a/src/ec/google/chromeec/switches.c +++ b/src/ec/google/chromeec/switches.c @@ -34,10 +34,9 @@ (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 @@ /* 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 c5146c6..1e372d8 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -286,10 +286,6 @@ 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 d554f10..3078e30 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -220,7 +220,6 @@ $(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) \ )