From: Mary Ruthven <mruthven@chromium.org>
Date: Wed, 28 Oct 2015 17:48:59 +0000 (-0700)
Subject: vboot: Add GBB flag to turn on serial output
X-Git-Url: http://git.legacy.paulk.fr/gitweb/?p=vboot.git;a=commitdiff_plain;h=74a94db035275f2acaf375d4993647e1981bab7d

vboot: Add GBB flag to turn on serial output

Currently this does nothing. This will eventually be used to enable
serial output.

BUG=chromium:210230
BRANCH=none
TEST=none

Change-Id: I5c25fd7406e30b96d12bc4bf8210d3c3f4ae79f1
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/309716
Reviewed-by: Randall Spangler <rspangler@chromium.org>
---

diff --git a/firmware/2lib/include/2struct.h b/firmware/2lib/include/2struct.h
index 2d43218c..da687b0c 100644
--- a/firmware/2lib/include/2struct.h
+++ b/firmware/2lib/include/2struct.h
@@ -275,6 +275,9 @@ enum vb2_gbb_flag {
 	 * dev_boot_fastboot_full_cap=0.
 	 */
 	VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP = (1 << 13),
+
+	/* Enable serial */
+	VB2_GBB_FLAG_ENABLE_SERIAL = (1 << 14),
 };
 
 struct vb2_gbb_header {
diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h
index c413372c..c7e2a05d 100644
--- a/firmware/include/gbb_header.h
+++ b/firmware/include/gbb_header.h
@@ -72,6 +72,8 @@
  * dev_boot_fastboot_full_cap=0.
  */
 #define GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP	0x00002000
+/* Enable serial console */
+#define GBB_FLAG_ENABLE_SERIAL				0x00004000
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/scripts/image_signing/set_gbb_flags.sh b/scripts/image_signing/set_gbb_flags.sh
index d2cba49a..ac96be6c 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -37,6 +37,7 @@ GBBFLAGS_DESCRIPTION="
   GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC          0x00000800
   GBB_FLAG_DISABLE_LID_SHUTDOWN              0x00001000
   GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP  0x00002000
+  GBB_FLAG_ENABLE_SERIAL		     0x00004000
 
   To get a developer-friendly device, try 0x11 (short_delay + boot_usb).
   For factory-related tests (always DEV), try 0x39.