<p>Julius Werner would like Patrick Georgi to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/25346">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vboot: Update to most recent GBB flag usage<br><br>This patch changes the GBB flag configuration to the latest usage in<br>upstream vboot (as of https://chromium-review.googlesource.com/976660).<br><br>Change-Id: I585d662d7de34b4964d028e3d06b4df5665fbe9e<br>Signed-off-by: Julius Werner <jwerner@chromium.org><br>---<br>M src/security/vboot/Kconfig<br>M src/security/vboot/Makefile.inc<br>2 files changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/25346/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig</span><br><span>index e2a3f20..8d8e120 100644</span><br><span>--- a/src/security/vboot/Kconfig</span><br><span>+++ b/src/security/vboot/Kconfig</span><br><span>@@ -303,8 +303,12 @@</span><br><span>        bool "Allow fastboot even if dev_boot_fastboot_full_cap=0"</span><br><span>         default n</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config GBB_FLAG_ENABLE_SERIAL</span><br><span style="color: hsl(0, 100%, 40%);">-      bool "Tell vboot to enable serial console"</span><br><span style="color: hsl(120, 100%, 40%);">+config GBB_FLAG_FORCE_MANUAL_RECOVERY</span><br><span style="color: hsl(120, 100%, 40%);">+   bool "Always assume manual recovery in recovery mode"</span><br><span style="color: hsl(120, 100%, 40%);">+       default n</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config GBB_FLAG_DISABLE_FWMP</span><br><span style="color: hsl(120, 100%, 40%);">+     bool "Disable Firmware Management Parameters (FWMP)"</span><br><span>       default n</span><br><span> </span><br><span> endmenu # GBB</span><br><span>diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc</span><br><span>index 75ecff3..53462d9 100644</span><br><span>--- a/src/security/vboot/Makefile.inc</span><br><span>+++ b/src/security/vboot/Makefile.inc</span><br><span>@@ -182,7 +182,8 @@</span><br><span>        $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC),0x800) \</span><br><span>     $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_LID_SHUTDOWN),0x1000) \</span><br><span>        $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP),0x2000) \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(call bool-to-mask,$(CONFIG_GBB_FLAG_ENABLE_SERIAL),0x4000) \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(call bool-to-mask,$(CONFIG_GBB_FLAG_FORCE_MANUAL_RECOVERY),0x4000) \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_FWMP),0x8000) \</span><br><span>        )</span><br><span> </span><br><span> ifneq ($(CONFIG_GBB_BMPFV_FILE),)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25346">change 25346</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25346"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I585d662d7de34b4964d028e3d06b4df5665fbe9e </div>
<div style="display:none"> Gerrit-Change-Number: 25346 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Julius Werner <jwerner@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>