Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/28750
Change subject: vboot/S3_RESUME: should not check VBOOT_STARTS_IN_BOOTBLOCK ......................................................................
vboot/S3_RESUME: should not check VBOOT_STARTS_IN_BOOTBLOCK
BUG=b:114018226 TEST=None
Change-Id: I6840c45604535089fa8410f03c69702bec91218f Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/vboot_logic.c 1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/28750/1
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index a0e6a32..e56e590 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -310,7 +310,6 @@ * does verification of memory init and thus must ensure it resumes with * the same slot that it booted from. */ if (IS_ENABLED(CONFIG_RESUME_PATH_SAME_AS_BOOT) && - IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK) && vboot_platform_is_resuming()) ctx.flags |= VB2_CONTEXT_S3_RESUME;