[coreboot-gerrit] Change in ...coreboot[master]: vboot: rename BOOT_OPROM_NEEDED to BOOT_DISPLAY_REQUEST

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32720 )

Change subject: vboot: rename BOOT_OPROM_NEEDED to BOOT_DISPLAY_REQUEST
......................................................................

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 
Cq-Depend: chromium:1605640
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32720
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Paul Menzel 
Reviewed-by: Julius Werner 
---
M src/security/vboot/vbnv.c
M src/security/vboot/vbnv_layout.h
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Furquan Shaikh: Looks good to me, approved
  Julius Werner: Looks good to me, approved

diff --git a/src/security/vboot/vbnv.c b/src/security/vboot/vbnv.c
index b999418..78502f7 100644
--- a/src/security/vboot/vbnv.c
+++ b/src/security/vboot/vbnv.c
@@ -140,11 +140,11 @@
    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 a9326e4..a3c2490 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