From 37a5d15da92a9fb8a682a32ef1eaf37734fcc5ad Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 17 Sep 2015 16:09:30 -0500 Subject: cbfs: add struct cbfsf Now that cbfs is adding more metadata in the cbfs file header one needs to access that metadata. Therefore, add struct cbfsf which tracks the metadata and data of the file separately. Note that stage and payload metadata specific to itself is still contained within the 'data' portion of a cbfs file. Update the cbfs API to use struct cbfsf. Additionally, remove struct cbfsd as there's nothing else associated with a cbfs region aside from offset and size which tracked by a region_device (thanks, CBFS_ALIGNMENT!). BUG=None BRANCH=None TEST=Built and booted through end of ramstage on qemu armv7. Built and booted glados using Chrome OS. Change-Id: I05486c6cf6cfcafa5c64b36324833b2374f763c2 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11679 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/intel/common/fsp_ramstage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/intel/common') diff --git a/src/soc/intel/common/fsp_ramstage.c b/src/soc/intel/common/fsp_ramstage.c index d1f2e49aff..c8dfad1f83 100644 --- a/src/soc/intel/common/fsp_ramstage.c +++ b/src/soc/intel/common/fsp_ramstage.c @@ -164,15 +164,15 @@ static void fsp_cache_save(struct prog *fsp) static int fsp_find_and_relocate(struct prog *fsp) { - struct region_device fsp_rdev; + struct cbfsf fsp_file; uint32_t type = CBFS_TYPE_FSP; - if (cbfs_boot_locate(&fsp_rdev, prog_name(fsp), &type)) { + if (cbfs_boot_locate(&fsp_file, prog_name(fsp), &type)) { printk(BIOS_ERR, "ERROR: Couldn't find fsp.bin in CBFS.\n"); return -1; } - if (fsp_relocate(fsp, &fsp_rdev)) { + if (fsp_relocate(fsp, &fsp_file.data)) { printk(BIOS_ERR, "ERROR: FSP relocation failed.\n"); return -1; } -- cgit v1.2.3