[coreboot-gerrit] Patch set updated for coreboot: lib/bootmode: Use newly-add recovery module

[Furquan Shaikh (furquan@google.com)]

Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15801

-gerrit

commit 5c976937cc0745e1cfdf9dcb77ebe0a68fa3f285
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri Jul 22 09:14:50 2016 -0700

    lib/bootmode: Use newly-add recovery module
    
    Use the newly added check recovery request function from recovery module
    in vboot2 to check for a pending recovery request.
    
    BUG=chrome-os-partner:55431
    
    Change-Id: I354cc094f1e5d0044cf13e5bc28246f058d470c6
    Signed-off-by: Furquan Shaikh <furquan at google.com>
---
 src/lib/bootmode.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index c695026..c6c29ac 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -29,31 +29,9 @@ int developer_mode_enabled(void)
 	return 0;
 }
 
-/*
- * This is called in multiple places and has to detect
- * recovery mode triggered from the EC and via shared
- * recovery reason set with crossystem.
- *
- * If shared recovery reason is set:
- * - before VbInit then get_recovery_mode_from_vbnv() is true
- * - after VbInit then vboot_handoff_check_recovery_flag() is true
- *
- * Otherwise the mainboard handler for get_recovery_mode_switch()
- * will detect recovery mode initiated by the EC.
- */
 int recovery_mode_enabled(void)
 {
-	if (get_recovery_mode_switch())
-		return 1;
-#if CONFIG_CHROMEOS
-	if (get_recovery_mode_from_vbnv())
-		return 1;
-#endif
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
-	if (vboot_handoff_check_recovery_flag())
-		return 1;
-#endif
-	return 0;
+	return !!vboot_check_recovery_request();
 }
 #endif /* CONFIG_BOOTMODE_STRAPS */