Joel Kitching has uploaded this change for review.

View Change

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) \

To view, visit change 37462. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I79af304e9608a30c6839cd616378c7330c3de00a
Gerrit-Change-Number: 37462
Gerrit-PatchSet: 1
Gerrit-Owner: Joel Kitching <kitching@google.com>
Gerrit-MessageType: newchange