summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-10-08 15:06:28 -0500
committerAaron Durbin <adurbin@gmail.com>2015-10-11 23:58:51 +0000
commit5d6f0f97b65e6f440e65ff8968dc45b1ae118804 (patch)
tree5f496cff8f83d130bf4b6fcb049769b661991ced
parent8475f2d0c554a67741824a4a9d84ddc0c31a0778 (diff)
downloadcoreboot-5d6f0f97b65e6f440e65ff8968dc45b1ae118804.tar.xz
soc/intel/common: use prog_locate() for finding fsp.bin
The current method was only taking the cbfs path. Because of this fsp.bin was never being utilized from the RW slots. Using prog_locate() now provides both the cbfs and vboot locate methods for free. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built and booted glados. Change-Id: I2b3e088326d5a965ad90806a7950b9f401ed57de Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11831 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/soc/intel/common/fsp_ramstage.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/soc/intel/common/fsp_ramstage.c b/src/soc/intel/common/fsp_ramstage.c
index c8dfad1f83..a1b677aa10 100644
--- a/src/soc/intel/common/fsp_ramstage.c
+++ b/src/soc/intel/common/fsp_ramstage.c
@@ -164,15 +164,12 @@ static void fsp_cache_save(struct prog *fsp)
static int fsp_find_and_relocate(struct prog *fsp)
{
- struct cbfsf fsp_file;
- uint32_t type = CBFS_TYPE_FSP;
-
- if (cbfs_boot_locate(&fsp_file, prog_name(fsp), &type)) {
- printk(BIOS_ERR, "ERROR: Couldn't find fsp.bin in CBFS.\n");
+ if (prog_locate(fsp)) {
+ printk(BIOS_ERR, "ERROR: Couldn't find %s\n", prog_name(fsp));
return -1;
}
- if (fsp_relocate(fsp, &fsp_file.data)) {
+ if (fsp_relocate(fsp, prog_rdev(fsp))) {
printk(BIOS_ERR, "ERROR: FSP relocation failed.\n");
return -1;
}