summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-05-10 12:33:08 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-05-15 17:49:24 +0000
commit18b51b7315bea0031f05f14dcad82857716d264e (patch)
treebd8b9e0be7d29df0b47706966dc4ccd0b9be2a7f
parentcaef7f837aee60a405ad8a923e97e4a6ba3aaa9c (diff)
downloadcoreboot-18b51b7315bea0031f05f14dcad82857716d264e.tar.xz
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>
-rw-r--r--src/security/vboot/vbnv.c4
-rw-r--r--src/security/vboot/vbnv_layout.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/security/vboot/vbnv.c b/src/security/vboot/vbnv.c
index b99941875c..78502f74ee 100644
--- a/src/security/vboot/vbnv.c
+++ b/src/security/vboot/vbnv.c
@@ -140,11 +140,11 @@ int get_recovery_mode_from_vbnv(void)
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)
{
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. */
diff --git a/src/security/vboot/vbnv_layout.h b/src/security/vboot/vbnv_layout.h
index a9326e4ff4..a3c2490c0d 100644
--- a/src/security/vboot/vbnv_layout.h
+++ b/src/security/vboot/vbnv_layout.h
@@ -31,7 +31,7 @@
#define BOOT_OFFSET 1
#define BOOT_DEBUG_RESET_MODE 0x80
#define BOOT_DISABLE_DEV_REQUEST 0x40
-#define BOOT_OPROM_NEEDED 0x20
+#define BOOT_DISPLAY_REQUEST 0x20
#define BOOT_TRY_B_COUNT_MASK 0x0F
#define RECOVERY_OFFSET 2