[coreboot-gerrit] Patch set updated for coreboot: vendorcode/google: Deal with MULTIPLE_CBFS_INSTANCES

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11914

-gerrit

commit dd2c98bab78cad63e4811acc0f8a2206e97ff6eb
Author: Patrick Georgi <pgeorgi at google.com>
Date:   Fri Oct 16 11:48:39 2015 +0200

    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 at google.com>
---
 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 769e267..ec95726 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");