Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: remove GBB flag FAFT_KEY_OVERIDE ......................................................................
vboot: remove GBB flag FAFT_KEY_OVERIDE
This flag was originally used to add some workarounds in firmware to get FAFT passing. Since we don't care about running FAFT on ToT for these boards, and since we'd like to avoid similar workarounds in the future, remove this flag.
BUG=b:124141368, chromium:965914 TEST=make clean && make test-abuild BRANCH=none
Change-Id: I79af304e9608a30c6839cd616378c7330c3de00a Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/37462/1
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index a829443..dfacc00 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -301,10 +301,6 @@ bool "Allow booting to legacy in dev mode even if dev_boot_legacy=0" default n
-config GBB_FLAG_FAFT_KEY_OVERIDE - bool "Allow booting using alternative keys for FAFT servo testing" - default n - config GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC bool "Disable EC software sync" default n diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 5292bd1..04c090d 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -218,7 +218,6 @@ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK),0x20) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_ENTER_TRIGGERS_TONORM),0x40) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_LEGACY),0x80) \ - $(call bool-to-mask,$(CONFIG_GBB_FLAG_FAFT_KEY_OVERIDE),0x100) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC),0x200) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY),0x400) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC),0x800) \
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: remove GBB flag FAFT_KEY_OVERIDE ......................................................................
Patch Set 1: Code-Review+1
Hello Yu-Ping Wu, 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/+/37462
to look at the new patch set (#2).
Change subject: vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT ......................................................................
vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT
This was renamed in vboot_reference CL:1977902.
BUG=b:124141368, chromium:965914 TEST=make clean && make test-abuild BRANCH=none
Change-Id: I79af304e9608a30c6839cd616378c7330c3de00a Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/37462/2
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT ......................................................................
Patch Set 2: Code-Review+2
(Dunno what Jenkins' problem is, try a rebase?)
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT ......................................................................
Patch Set 2:
Patch Set 2: Code-Review+2
(Dunno what Jenkins' problem is, try a rebase?)
"Change is up to date with the target branch already (master)"
:\
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT ......................................................................
Patch Set 3:
The issue was that master was broken for a short while. This is now fixed and this CL will pick it up after the rebase.
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37462 )
Change subject: vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT ......................................................................
vboot: rename GBB flag FAFT_KEY_OVERIDE to FLAG_RUNNING_FAFT
This was renamed in vboot_reference CL:1977902.
BUG=b:124141368, chromium:965914 TEST=make clean && make test-abuild BRANCH=none
Change-Id: I79af304e9608a30c6839cd616378c7330c3de00a Signed-off-by: Joel Kitching kitching@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37462 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Julius Werner jwerner@chromium.org --- M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 2 files changed, 3 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 54e88dd..2863952 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -307,8 +307,8 @@ bool "Allow booting to legacy in dev mode even if dev_boot_legacy=0" default n
-config GBB_FLAG_FAFT_KEY_OVERIDE - bool "Allow booting using alternative keys for FAFT servo testing" +config GBB_FLAG_RUNNING_FAFT + bool "Running FAFT tests; used as a hint to disable other debug features" default n
config GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 2fe2d92..138273f 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -226,7 +226,7 @@ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK),0x20) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_ENTER_TRIGGERS_TONORM),0x40) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_LEGACY),0x80) \ - $(call bool-to-mask,$(CONFIG_GBB_FLAG_FAFT_KEY_OVERIDE),0x100) \ + $(call bool-to-mask,$(CONFIG_GBB_FLAG_RUNNING_FAFT),0x100) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC),0x200) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY),0x400) \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC),0x800) \
-
Joel Kitching (Code Review) -
Julius Werner (Code Review)
-
Patrick Georgi (Code Review)
-
Yu-Ping Wu (Code Review)