Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10198
-gerrit
commit b6388bd8e2f003cd99053680d350eae1d1581ae4 Author: Aaron Durbin adurbin@chromium.org Date: Wed May 13 14:00:28 2015 -0500
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 adurbin@chromium.org --- 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 16261b4..417a496 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)