GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: rename BOOT_OPROM_NEEDED to BOOT_DISPLAY_REQUEST 

Verified Boot OPROM code is being refactored.  OPROM is being
generalized into "display initialization".  As such, the NVRAM
request flag is being renamed from OPROM_NEEDED to
DISPLAY_REQUEST.

BUG=b:124141368, b:124192753, chromium:948529
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: I74374abf7d1deb594c073f7a4a76c9de46092143
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1605640
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32720
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Joel Kitching 2019-05-10 12:33:08 +08:00 committed by Patrick Georgi
parent caef7f837a
commit 18b51b7315
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/security/vboot/vbnv.c
View File

@ -140,11 +140,11 @@ int get_recovery_mode_from_vbnv(void)
return vbnv_data(RECOVERY_OFFSET); return vbnv_data(RECOVERY_OFFSET);
} }
/* Read the BOOT_OPROM_NEEDED flag from VBNV. */ /* Read the BOOT_DISPLAY_REQUEST flag from VBNV. */
int vboot_wants_oprom(void) int vboot_wants_oprom(void)
{ {
vbnv_setup(); vbnv_setup();
return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; return (vbnv_data(BOOT_OFFSET) & BOOT_DISPLAY_REQUEST) ? 1 : 0;
} }
/* Read the USB Device Controller(UDC) enable flag from VBNV. */ /* Read the USB Device Controller(UDC) enable flag from VBNV. */

2
src/security/vboot/vbnv_layout.h
View File

@ -31,7 +31,7 @@
#define BOOT_OFFSET 1 #define BOOT_OFFSET 1
#define BOOT_DEBUG_RESET_MODE 0x80 #define BOOT_DEBUG_RESET_MODE 0x80
#define BOOT_DISABLE_DEV_REQUEST 0x40 #define BOOT_DISABLE_DEV_REQUEST 0x40
#define BOOT_OPROM_NEEDED 0x20 #define BOOT_DISPLAY_REQUEST 0x20
#define BOOT_TRY_B_COUNT_MASK 0x0F #define BOOT_TRY_B_COUNT_MASK 0x0F
#define RECOVERY_OFFSET 2 #define RECOVERY_OFFSET 2