From 85cc5fdc4ab385a092be49fe137b96f62d6f2d42 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 31 Mar 2016 12:34:32 +0200 Subject: chromeos: Add enable-serial GBB flag This mirrors vboot's flag table. BUG=chromium:595715 BRANCH=none TEST=none Change-Id: I4473eb6c0e073f555e6a692a447e8cc85f8e4eeb Signed-off-by: Patrick Georgi Original-Commit-Id: 0fc50a6cff5ba900e6407d58a8f18db63b5946a5 Original-Change-Id: Ieabd3f9391ba256557e18386f334558d64a81694 Original-Signed-off-by: Patrick Georgi Original-Reviewed-on: https://chromium-review.googlesource.com/336630 Original-Commit-Ready: Patrick Georgi Original-Tested-by: Patrick Georgi Original-Reviewed-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/14238 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/vendorcode/google/chromeos/Kconfig | 5 +++++ src/vendorcode/google/chromeos/Makefile.inc | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 114560fbb3..7726895a08 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -233,6 +233,11 @@ config GBB_FLAG_DISABLE_LID_SHUTDOWN 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" + default n + endmenu # GBB menu "Vboot Keys" diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 7d62b5b530..43258d0bd4 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -86,7 +86,9 @@ GBB_FLAGS := $(call int-add, \ $(call bool-to-mask,$(CONFIG_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY),0x400) \ $(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_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP),0x2000) \ + $(call bool-to-mask,$(CONFIG_GBB_FLAG_ENABLE_SERIAL),0x4000) \ + ) ifneq ($(CONFIG_GBB_BMPFV_FILE),) $(obj)/gbb.stub: $(obj)/coreboot.rom $(FUTILITY) -- cgit v1.2.3