summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2018-03-23 21:02:48 -0700
committerJulius Werner <jwerner@chromium.org>2018-03-26 22:46:44 +0000
commitae423852c2a533d41e7912dad6b46594c4bf8f04 (patch)
treed4707a444cfc60ed8a09998c5061a64ad6c1dbea /src/security
parentbe78775a9302f9526df6eb61f8a430f4298f0e97 (diff)
downloadcoreboot-ae423852c2a533d41e7912dad6b46594c4bf8f04.tar.xz
vboot: Update to most recent GBB flag usage
This patch changes the GBB flag configuration to the latest usage in upstream vboot (as of https://chromium-review.googlesource.com/976660). Change-Id: I585d662d7de34b4964d028e3d06b4df5665fbe9e Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/25346 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/vboot/Kconfig8
-rw-r--r--src/security/vboot/Makefile.inc3
2 files changed, 8 insertions, 3 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index e2a3f20792..8d8e120abb 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -303,8 +303,12 @@ 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_ENABLE_SERIAL
- bool "Tell vboot to enable serial console"
+config GBB_FLAG_FORCE_MANUAL_RECOVERY
+ bool "Always assume manual recovery in recovery mode"
+ default n
+
+config GBB_FLAG_DISABLE_FWMP
+ bool "Disable Firmware Management Parameters (FWMP)"
default n
endmenu # GBB
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 75ecff3b21..53462d9531 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -182,7 +182,8 @@ GBB_FLAGS := $(call int-add, \
$(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_ENABLE_SERIAL),0x4000) \
+ $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_MANUAL_RECOVERY),0x4000) \
+ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FWMP),0x8000) \
)
ifneq ($(CONFIG_GBB_BMPFV_FILE),)