From 90cf4bb02aac15a41873ef9435d826b143a0a04e Mon Sep 17 00:00:00 2001 From: Christian Walter Date: Mon, 29 Jul 2019 09:54:23 +0000 Subject: Revert "src/security/vboot: Add option to skip display init with vboot 2.0" This reverts commit 598af2e2c2785c00eb4290cdcefe1082b2a6f858. Reason for revert: This commit breaks every board with VBOOT enabled if the platform is apollolake, broadwell, skylake, baswell, baytrails or icelake. The reason is, that the SoC selects VBOOT_MUST_REQUEST_DISPLAY by default, and this has a dependency now on VBOOT_MAY_SKIP_DISPLAY_INIT. This will only be auto-selected if it is a CHROMEOS platform. Change-Id: I3872d9aa993326ded135d8a5d950d5b1b1eddf34 Signed-off-by: Christian Walter Reviewed-on: https://review.coreboot.org/c/coreboot/+/34308 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- src/lib/bootmode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/bootmode.c') diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index 083fd9d49d..2465966b3a 100644 --- a/src/lib/bootmode.c +++ b/src/lib/bootmode.c @@ -2,7 +2,6 @@ * 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,7 +33,8 @@ void gfx_set_init_done(int done) int display_init_required(void) { - if (CONFIG(VBOOT_MAY_SKIP_DISPLAY_INIT)) { + /* For vboot, always honor VBOOT_WD_FLAG_DISPLAY_INIT. */ + if (CONFIG(VBOOT)) { /* Must always select MUST_REQUEST_DISPLAY when using this function. */ if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY)) -- cgit v1.2.3