From 087477fd0efc04e7e565620a1d9d0b3d7c7aec77 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 16 Oct 2015 11:48:39 +0200 Subject: [PATCH] vendorcode/google: Deal with MULTIPLE_CBFS_INSTANCES We need to special-case filling out the vboot structures when we use CBFS instead of vboot's custom indexed format, otherwise (due to the way the CBFS header looks), it will try to write several million entries. Change-Id: Ie1289d4a19060bac48089ff70e5cfc04a2de373f Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/11914 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index 769e2679ef..ec95726493 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -151,6 +151,9 @@ void vboot_fill_handoff(void) if (vboot_is_readonly_path()) return; + if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) + return; + if (vb2_get_selected_region(&fw_main)) die("No component metadata.\n");