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) \ )
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG@8 PS1, Line 8: Please document the rationale for those who can't read restricted issues. Something like "It's unused, unmaintained, doesn't even build right now and there's no indication that this will change"?
Hello Aaron Durbin, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35002
to look at the new patch set (#2).
Change subject: vboot: remove fastboot support ......................................................................
vboot: remove fastboot support
Fastboot support in vboot_reference is unused, unmaintained, and produces compile errors when enabled. Since there is no current or planned use cases for fastboot, remove it.
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/2
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG@8 PS1, Line 8:
Please document the rationale for those who can't read restricted issues. […]
Sorry about that! I've added more details.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
Patch Set 2: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... File src/ec/google/chromeec/switches.c:
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... PS2, Line 40: Is there code in the EC code base we need to get rid of as well? (You can file a bug for the EC folks to clean that up if you don't want to deal with it yourself, just wanna make sure it doesn't get lost.)
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35002/1//COMMIT_MSG@8 PS1, Line 8:
Sorry about that! I've added more details.
Done
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... File src/ec/google/chromeec/switches.c:
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... PS2, Line 40:
Is there code in the EC code base we need to get rid of as well? (You can file a bug for the EC folk […]
(edit: wasn't supposed to be a blocking comment)
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... File src/ec/google/chromeec/switches.c:
https://review.coreboot.org/c/coreboot/+/35002/2/src/ec/google/chromeec/swit... PS2, Line 40:
(edit: wasn't supposed to be a blocking comment)
I've added this bug to deal with the EC side of things:
https://bugs.chromium.org/p/chromium/issues/detail?id=999460
Joel Kitching has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/35002 )
Change subject: vboot: remove fastboot support ......................................................................
vboot: remove fastboot support
Fastboot support in vboot_reference is unused, unmaintained, and produces compile errors when enabled. Since there is no current or planned use cases for fastboot, remove it.
BUG=b:124141368, chromium:995172 TEST=make clean && make test-abuild BRANCH=none
Change-Id: I06ea816ffb910163ec2c3c456b3c09408c806d0b Signed-off-by: Joel Kitching kitching@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35002 Reviewed-by: Julius Werner jwerner@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- 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(-)
Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
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) \ )
-
Joel Kitching (Code Review) -
Julius Werner (Code Review)
-
Patrick Georgi (Code Review)