[coreboot-gerrit] Change in coreboot[master]: vboot: Update to most recent GBB flag usage

[Julius Werner (Code Review)]

Hello Patrick Georgi,

I'd like you to do a code review. Please visit

    https://review.coreboot.org/25346

to review the following change.


Change subject: vboot: Update to most recent GBB flag usage
......................................................................

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 at chromium.org>
---
M src/security/vboot/Kconfig
M src/security/vboot/Makefile.inc
2 files changed, 8 insertions(+), 3 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/25346/1

diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index e2a3f20..8d8e120 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -303,8 +303,12 @@
 	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 75ecff3..53462d9 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -182,7 +182,8 @@
 	$(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),)

-- 
To view, visit https://review.coreboot.org/25346
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I585d662d7de34b4964d028e3d06b4df5665fbe9e
Gerrit-Change-Number: 25346
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner at chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180324/d8aca0fc/attachment.html>