Amol N Sukerkar has uploaded this change for review.

View Change

src/lib: Disable display init skip when VBOOT Stage Verification is enabled

When VBOOT is enabled, by default it native display init is skipped
and custom display init mechanism is utilized. VBOOT Stage
Verification utilizes native display init. This change implements
that feature.

TEST=Create a coreboot.rom image by enabling CONFIG_VBOOT and
     CONFIG_VBOOT_STAGE_VERIFICATION. Verify that the image boots
     to authenticated payload and graphics is displayed via HDMI
     and Display Port.

Change-Id: I65a96ec74f7b494d0c16814d84067e004ceebe70
Signed-off-by: Sukerkar, Amol N <amol.n.sukerkar@intel.com>
---
M src/lib/bootmode.c
1 file changed, 7 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/32149/1

diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index e402536..2cf9bd0 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -2,6 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
+ * Copyright (C) 2019 Intel Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,8 +35,12 @@
 
 int display_init_required(void)
 {
-	/* For Chrome OS always honor vboot_handoff_skip_display_init(). */
-	if (CONFIG(CHROMEOS))
+	/* For Chrome OS always honor vboot_handoff_skip_display_init().
+	 * A special case is when CONFIG_VBOOT_STAGE_VERIFICATION is
+	 * enabled. In that case, vboot_handoff_skip_display_init()
+	 * is overridden native display init mechanism. */
+	if (IS_ENABLED(CONFIG_CHROMEOS) &&
+		!IS_ENABLED(CONFIG_VBOOT_STAGE_VERIFICATION))
 		return !vboot_handoff_skip_display_init();
 
 	/* By default always initialize display. */

To view, visit change 32149. To unsubscribe, or for help writing mail filters, visit settings.