Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2880
-gerrit
commit f06cf25f0aee1cc5ebf60ce627afb00bcb26747d Author: Aaron Durbin adurbin@chromium.org Date: Fri Mar 22 19:46:16 2013 -0500
cbfs: fix relocation ramstage compiler errors
There were some cbfs calls that did not get transitioned to the new cbfs API. Fix the callsites to conform to the actual cbfs, thus fixing the copilation errors.
Change-Id: Ia9fe2c4efa32de50982e21bd01457ac218808bd3 Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/lib/cbfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 39e6c11..aba1bcc 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -239,13 +239,13 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) ramstage = cbmem_entry_find(CBMEM_ID_RAMSTAGE);
if (ramstage == NULL) - return load_stage_from_cbfs(name, handoff); + return load_stage_from_cbfs(media, name, handoff);
/* S3 resume path. Load a cached copy of the loaded ramstage. If * return value is NULL load from cbfs. */ entry = load_cached_ramstage(handoff, ramstage); if (entry == NULL) - return load_stage_from_cbfs(name, handoff); + return load_stage_from_cbfs(media, name, handoff);
return entry; }