summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2016-07-22 06:59:40 -0700
committerFurquan Shaikh <furquan@google.com>2016-07-25 18:55:35 +0200
commita6c5ddd595e145ffd091a9fcadb5e0ffbf0fa8d1 (patch)
tree1e5355202ab90185b8ab4ecf1cc75ae1f66bd9ba /src/soc/intel/skylake
parent610a33a7f4d8c46df63373477a9b19563189acea (diff)
vboot: Clean up vboot code
1. Remove unused functions/structures. 2. Add checks for NULL return values. 3. Change prefixes to vb2 instead of vboot for functions used internally within vboot2/ 4. Get rid of vboot_handoff.h file and move the structure definition to vboot_common.h 5. Rename all functions using handoff structure to have prefix vboot_handoff_*. All the handoff functions can be run _only_ after cbmem is online. 6. Organize vboot_common.h content according to different functionalities. BUG=chrome-os-partner:55431 Change-Id: I4c07d50327d88cddbdfbb0b6f82c264e2b8620eb Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/15799 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/soc/intel/skylake')
-rw-r--r--src/soc/intel/skylake/fsp_reset.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/soc/intel/skylake/fsp_reset.c b/src/soc/intel/skylake/fsp_reset.c
index 4751872a47..f25f1572f5 100644
--- a/src/soc/intel/skylake/fsp_reset.c
+++ b/src/soc/intel/skylake/fsp_reset.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
#include <bootstate.h>
-#include <vendorcode/google/chromeos/vboot_handoff.h>
+#include <vendorcode/google/chromeos/vboot_common.h>
static int is_recovery; /* flag to identify recovery mode */
@@ -35,8 +35,10 @@ static void set_recovery_request(void *unused)
* Set recovery flag during Recovery Mode Silicon Init
* & store recovery request into VBNV
*/
- if (is_recovery)
- set_recovery_mode_into_vbnv(vboot_recovery_reason());
+ if (is_recovery) {
+ int reason = vboot_handoff_get_recovery_reason();
+ set_recovery_mode_into_vbnv(reason);
+ }
}