diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-07-22 09:14:50 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2016-07-25 18:56:06 +0200 |
| commit | 8edfc1c51235e9ab306cb7b2f3936518f87ddf2a (patch) | |
| tree | f69620539453312eb96911327d244ece8a653fe5 | |
| parent | 6d448e3aa6c84487ec6d3fcc09cf015e4433619d (diff) | |
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@google.com>
Reviewed-on: https://review.coreboot.org/15801
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/lib/bootmode.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index c69502691a..c6c29acc17 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 */ |