diff options
| -rw-r--r-- | src/lib/bootmode.c | 4 | ||||
| -rw-r--r-- | src/security/vboot/Kconfig | 11 |
2 files changed, 2 insertions, 13 deletions
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)) diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index fa9893520a..ea1f73889a 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -154,21 +154,10 @@ config VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT reboots caused after vboot verification is run. e.g. reboots caused by FSP components on Intel platforms. -config VBOOT_MAY_SKIP_DISPLAY_INIT - bool "Skip display initialization in normal mode" - default y if CHROMEOS - default n - help - Set this option to indicate that coreboot should skip display - initialization on a normal (non-recovery, non-developer) boot. - This is useful for platforms that do not support firmware - user-interface in normal mode. - config VBOOT_MUST_REQUEST_DISPLAY bool default y if VGA_ROM_RUN default n - depends on VBOOT_MAY_SKIP_DISPLAY_INIT help Set this option to indicate to vboot that this platform will skip its display initialization on a normal (non-recovery, non-developer) boot. |