summaryrefslogtreecommitdiff
path: root/src/vendorcode/google
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2015-10-16 11:48:39 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-10-19 21:09:30 +0200
commit087477fd0efc04e7e565620a1d9d0b3d7c7aec77 (patch)
treee3fa292407ca7d8432a89f8c747b7618dd5792fe /src/vendorcode/google
parentd98471ccb412f61d7da2c5eb5ca8eeb8fece384a (diff)
downloadcoreboot-087477fd0efc04e7e565620a1d9d0b3d7c7aec77.tar.xz
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 <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/11914 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/vendorcode/google')
-rw-r--r--src/vendorcode/google/chromeos/vboot2/vboot_handoff.c3
1 files changed, 3 insertions, 0 deletions
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");