[coreboot-gerrit] New patch to review for coreboot: vboot2: Look up actual CBFS in MULTIPLE_CBFS configuration

[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/11805

-gerrit

commit 3c4ebf15198f2da59a4939f9523e1d7e78b4d787
Author: Patrick Georgi <pgeorgi at google.com>
Date:   Tue Oct 6 21:34:02 2015 +0200

    vboot2: Look up actual CBFS in MULTIPLE_CBFS configuration
    
    Up to now, the multi-CBFS code path merely looked up files in the "boot
    ro" image (ie. the default), disregarding the specified fmap region to
    use for CBFS.
    
    The code still relies on the master header being around, which on the
    upside allows it to skip an offset at the beginning of the region (eg.
    for ARM bootblocks).
    
    This will change later (both the reliance on the master header and the
    presence of the bootblock like this).
    
    Change-Id: Ib2fc03eac8add59fc90b4e601f6dfa488257b326
    Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
 src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
index 90ada1e..40f3fa3 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
@@ -163,17 +163,7 @@ static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main,
 					struct asset *asset)
 {
 	struct cbfsd cbfs;
-	struct region_device rdev;
-	struct cbfs_props props;
-
-	if (cbfs_boot_region_properties(&props))
-		return -1;
-
-	if (rdev_chain(&rdev, fw_main, props.offset, props.size))
-		return -1;
-
-	cbfs.rdev = &rdev;
-
+	cbfs.rdev = fw_main;
 	return cbfs_locate(asset_rdev(asset), &cbfs, asset_name(asset), NULL);
 }