GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Furquan Shaikh 2016-07-22 09:14:50 -07:00
parent 6d448e3aa6
commit 8edfc1c512
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/bootmode.c
View File

@ -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 */