From 20ae9dee73f9c924e7e2e87489d7fb68af3ff8ec Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 24 Oct 2013 15:51:54 -0500 Subject: [PATCH] cbfs: fix load_stage_from_cbfs() for CONFIG_RELOCATABLE_RAMSTAGE The load_stage_from_cbfs() when CONFIG_RELOCATABLE_RAMSTAGE is selected is incorrect in that it hard coded the wrong stage name. Instead it should honor the name past in instead of using a predetermined (and wrong!) name. BUG=chrome-os-partner:22866 BRANCH=None TEST=Built booted. Noted fallback path works. Change-Id: I61654313d15167efe50d5e4ff24fb06eab16f389 Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/174391 Reviewed-by: Duncan Laurie --- src/lib/cbfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index b83d55b3b2..d7182a7df2 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -130,7 +130,7 @@ static void *load_stage_from_cbfs(struct cbfs_media *media, const char *name, { struct rmod_stage_load rmod_ram = { .cbmem_id = CBMEM_ID_RAMSTAGE, - .name = CONFIG_CBFS_PREFIX "/vboot", + .name = name, }; if (rmodule_stage_load_from_cbfs(&rmod_ram)) {