diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-12-08 17:00:23 -0600 |
---|---|---|
committer | Aaron Durbin <adurbin@chromium.org> | 2015-12-10 04:43:58 +0100 |
commit | 6d720f38e06d14cc8a89635f66dc124dcd5ac150 (patch) | |
tree | 874aecaf8f35d8db1740dabc7735e3e44cb9ca5e /src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | |
parent | bf3dbaf86d033becc231a48612d474fac9add1ee (diff) |
cbfs/vboot: remove firmware component support
The Chrome OS verified boot path supported multiple CBFS
instances in the boot media as well as stand-alone assets
sitting in each vboot RW slot. Remove the support for the
stand-alone assets and always use CBFS accesses as the
way to retrieve data.
This is implemented by adding a cbfs_locator object which
is queried for locating the current CBFS. Additionally, it
is also signalled prior to when a program is about to be
loaded by coreboot for the subsequent stage/payload. This
provides the same opportunity as previous for vboot to
hook in and perform its logic.
BUG=chromium:445938
BRANCH=None
TEST=Built and ran on glados.
CQ-DEPEND=CL:307121,CL:31691,CL:31690
Change-Id: I6a3a15feb6edd355d6ec252c36b6f7885b383099
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/12689
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/google/chromeos/vboot2/vboot_handoff.c')
-rw-r--r-- | src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index dc3515f459..246aefecee 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -120,12 +120,8 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, void vboot_fill_handoff(void) { - int i; struct vboot_handoff *vh; struct vb2_shared_data *sd; - struct region_device fw_main; - struct vboot_components *fw_info; - size_t metadata_sz; sd = vb2_get_shared_data(); sd->workbuf_hash_offset = 0; @@ -142,33 +138,6 @@ 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()) - return; - - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) - return; - - if (vb2_get_selected_region(&fw_main)) - die("No component metadata.\n"); - - metadata_sz = sizeof(*fw_info); - metadata_sz += MAX_PARSED_FW_COMPONENTS * sizeof(fw_info->entries[0]); - - fw_info = rdev_mmap(&fw_main, 0, metadata_sz); - - if (fw_info == NULL) - die("failed to locate firmware components\n"); - - /* these offset & size are used to load a rw boot loader */ - for (i = 0; i < fw_info->num_components; i++) { - vh->components[i].address = region_device_offset(&fw_main); - vh->components[i].address += fw_info->entries[i].offset; - vh->components[i].size = fw_info->entries[i].size; - } - - rdev_munmap(&fw_main, fw_info); } /* |