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>
This commit is contained in:
parent
be78775a93
commit
ae423852c2
|
@ -303,8 +303,12 @@ config GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP
|
||||||
bool "Allow fastboot even if dev_boot_fastboot_full_cap=0"
|
bool "Allow fastboot even if dev_boot_fastboot_full_cap=0"
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config GBB_FLAG_ENABLE_SERIAL
|
config GBB_FLAG_FORCE_MANUAL_RECOVERY
|
||||||
bool "Tell vboot to enable serial console"
|
bool "Always assume manual recovery in recovery mode"
|
||||||
|
default n
|
||||||
|
|
||||||
|
config GBB_FLAG_DISABLE_FWMP
|
||||||
|
bool "Disable Firmware Management Parameters (FWMP)"
|
||||||
default n
|
default n
|
||||||
|
|
||||||
endmenu # GBB
|
endmenu # GBB
|
||||||
|
|
|
@ -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_PD_SOFTWARE_SYNC),0x800) \
|
||||||
$(call bool-to-mask,$(CONFIG_GBB_FLAG_DISABLE_LID_SHUTDOWN),0x1000) \
|
$(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_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),)
|
ifneq ($(CONFIG_GBB_BMPFV_FILE),)
|
||||||
|
|
Loading…
Reference in New Issue