From 6d720f38e06d14cc8a89635f66dc124dcd5ac150 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 8 Dec 2015 17:00:23 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/12689 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Patrick Georgi Reviewed-by: Stefan Reinauer --- src/vendorcode/google/chromeos/vboot_handoff.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/vendorcode/google/chromeos/vboot_handoff.h') diff --git a/src/vendorcode/google/chromeos/vboot_handoff.h b/src/vendorcode/google/chromeos/vboot_handoff.h index 4b88e829a6..f06044403d 100644 --- a/src/vendorcode/google/chromeos/vboot_handoff.h +++ b/src/vendorcode/google/chromeos/vboot_handoff.h @@ -21,30 +21,14 @@ #include "chromeos.h" #include "vboot_common.h" -/* - * The vboot handoff structure keeps track of a maximum number of firmware - * components in the verfieid RW area of flash. This is not a restriction on - * the number of components packed in a firmware block. It's only the maximum - * number of parsed firmware components (address and size) included in the - * handoff structure. - */ -#define MAX_PARSED_FW_COMPONENTS 6 - -struct firmware_component { - uint32_t address; - uint32_t size; -} __attribute__((packed)); - /* * The vboot_handoff structure contains the data to be consumed by downstream * firmware after firmware selection has been completed. Namely it provides - * vboot shared data as well as the flags from VbInit. As noted above a finite - * number of components are parsed from the verfieid firmare region. + * vboot shared data as well as the flags from VbInit. */ struct vboot_handoff { VbInitParams init_params; uint32_t selected_firmware; - struct firmware_component components[MAX_PARSED_FW_COMPONENTS]; char shared_data[VB_SHARED_DATA_MIN_SIZE]; } __attribute__((packed)); -- cgit v1.2.3