From 3dc60c51cb5fd3658758c68fe4c529c52f29554d Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 May 2015 14:00:28 -0500 Subject: [PATCH] vboot: fix die() hang for recovery path When we are taking the recovery path there is no slot or components to fill out. Change-Id: Ic97a247629365ef54a340c4398cb7491935edc11 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10198 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Paul Menzel --- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index 16261b4a02..417a4962e1 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -147,6 +147,10 @@ void vboot_fill_handoff(void) /* needed until we finish transtion to vboot2 for kernel verification */ fill_vboot_handoff(vh, sd); + /* Nothing left to do in readonly path. */ + if (vboot_is_readonly_path(wd)) + return; + vb2_get_selected_region(wd, &fw_main); fw_info = vboot_locate_components(&fw_main); if (fw_info == NULL)