From ec065e8096caa908b177fb8882eea9b07840b895 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 18 Jul 2016 00:58:41 -0500 Subject: drivers/intel/fsp2_0: remove unused fsp_load_binary() Remove the now unused fsp_load_binary() function. BUG=chrome-os-partner:52679 Change-Id: I5667eb71689a69a9e05f7be05cb0c7e7795a55d3 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/15743 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/drivers/intel/fsp2_0/include/fsp/util.h | 3 --- src/drivers/intel/fsp2_0/util.c | 38 ----------------------------- 2 files changed, 41 deletions(-) diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 0f4d33c427..f4638e5caa 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -39,9 +39,6 @@ void fsp_print_memory_resource_hobs(const void *hob_list); enum cb_err fsp_validate_component(struct fsp_header *hdr, const struct region_device *rdev); -/* Load an FSP binary into CBFS, and fill the associated fsp_header struct */ -enum cb_err fsp_load_binary(struct fsp_header *hdr, const char *name, - struct range_entry *r); /* Load a vbt.bin file for graphics. Returns 0 if a valid VBT is not found. */ uintptr_t fsp_load_vbt(void); diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 942ea09e1b..faf1dd3a02 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -16,8 +16,6 @@ #include #include #include -#include -#include #include #include @@ -136,42 +134,6 @@ enum cb_err fsp_validate_component(struct fsp_header *hdr, return CB_SUCCESS; } -/* TODO: this won't work for SoC's that need to XIP certain modules. */ -enum cb_err fsp_load_binary(struct fsp_header *hdr, - const char *name, - struct range_entry *range) -{ - struct cbfsf file_desc; - struct region_device file_data; - - if (cbfs_boot_locate(&file_desc, name, NULL)) { - printk(BIOS_ERR, "Could not locate %s in CBFS\n", name); - return CB_ERR; - } - - cbfs_file_data(&file_data, &file_desc); - - if (fsp_validate_component(hdr, &file_data) != CB_SUCCESS) - return CB_ERR; - - /* Check if the component load address is within expected range */ - /* TODO: this doesn't check the current running program footprint. */ - if (range_entry_base(range) > hdr->image_base || - range_entry_end(range) <= hdr->image_base + hdr->image_size) { - printk(BIOS_ERR, "%s is outside of allowed range\n", name); - return CB_ERR; - } - - /* Load binary into memory. */ - if (rdev_readat(&file_data, (void *)hdr->image_base, 0, hdr->image_size) < 0) - return CB_ERR; - - /* Signal that FSP component has been loaded. */ - prog_segment_loaded(hdr->image_base, hdr->image_size, SEG_FINAL); - - return CB_SUCCESS; -} - void fsp_handle_reset(enum fsp_status status) { switch(status) { -- cgit v1.2.3