From c6c023c60dd16e190041e3f69dd14d95e483ef00 Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Sun, 6 Nov 2016 12:51:14 +0530 Subject: [PATCH] UPSTREAM: vboot: Disable vboot verification when Chrome EC disabled When Chrome EC is disabled, vboot hash is not available during S3 resume Hence disable vboot verification when Chrome EC is not available. BUG=None BRANCH=None TEST=None Signed-off-by: Naresh G Solanki Reviewed-on: https://review.coreboot.org/17246 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: I665f5f0e2e53da7b735de30443d323572d8a1a9c Reviewed-on: https://chromium-review.googlesource.com/408959 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/vboot/vboot_logic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/vboot/vboot_logic.c b/src/vboot/vboot_logic.c index bc6ab48191..41896e1126 100644 --- a/src/vboot/vboot_logic.c +++ b/src/vboot/vboot_logic.c @@ -118,6 +118,13 @@ static int handle_digest_result(void *slot_hash, size_t slot_hash_sz) { int is_resume; + /* + * Chrome EC is the only support for vboot_save_hash()/vboot_retrieve_hash(), if Chrome EC + * is not enabled then return. + */ + if (!IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) + return 0; + /* * Nothing to do since resuming on the platform doesn't require * vboot verification again.