3 files changed, 0 insertions, 15 deletions
diff --git a/src/security/vboot/vbnv.c b/src/security/vboot/vbnv.c
index 78502f74ee..0c4f33bc11 100644
--- a/src/security/vboot/vbnv.c
+++ b/src/security/vboot/vbnv.c
@@ -140,13 +140,6 @@ int get_recovery_mode_from_vbnv(void)
 	return vbnv_data(RECOVERY_OFFSET);
 }
 
-/* Read the BOOT_DISPLAY_REQUEST flag from VBNV. */
-int vboot_wants_oprom(void)
-{
-	vbnv_setup();
-	return (vbnv_data(BOOT_OFFSET) & BOOT_DISPLAY_REQUEST) ? 1 : 0;
-}
-
 /* Read the USB Device Controller(UDC) enable flag from VBNV. */
 int vbnv_udc_enable_flag(void)
 {
diff --git a/src/security/vboot/vbnv.h b/src/security/vboot/vbnv.h
index c8e689fa04..a2f0b4c978 100644
--- a/src/security/vboot/vbnv.h
+++ b/src/security/vboot/vbnv.h
@@ -25,7 +25,6 @@ int verify_vbnv(uint8_t *vbnv_copy);
 void regen_vbnv_crc(uint8_t *vbnv_copy);
 int get_recovery_mode_from_vbnv(void);
 void set_recovery_mode_into_vbnv(int recovery_reason);
-int vboot_wants_oprom(void);
 
 /* Read the USB Device Controller(UDC) enable flag from VBNV. */
 int vbnv_udc_enable_flag(void);
diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
index fccbdfc0b7..8a6b3d61e8 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -68,13 +68,6 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
 		vb_sd->flags |= VBSD_BOOT_DEV_SWITCH_ON;
 		vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON;
 	}
-	/* TODO(chromium:948529): Remove these two flags after downstream
-	   vboot code longer reads them. */
-	if (vboot_wants_oprom() || vb2_sd->recovery_reason ||
-	    vb2_sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED)
-		vb_sd->flags |= VBSD_OPROM_LOADED;
-	if (CONFIG(VBOOT_MUST_REQUEST_DISPLAY))
-		vb_sd->flags |= VBSD_OPROM_MATTERS;
 
 	/* In vboot1, VBSD_FWB_TRIED is
 	 * set only if B is booted as explicitly requested. Therefore, if B is