GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: handle RELOCATABLE_RAMSTAGE 

The support for RELOCATABLE_RAMSTAGE was accidentally omitted in
the vboot loader. Add said support.

Change-Id: I569918823253c33f698acefd6a619133543c7aef
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/10184
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Aaron Durbin 2015-05-12 16:43:10 -05:00
parent 3dad489cac
commit 09560facd4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vendorcode/google/chromeos/vboot2/vboot_loader.c
View File

@ -18,8 +18,10 @@
*/
#include <cbfs.h>
#include <cbmem.h>
#include <console/console.h>
#include <program_loading.h>
#include <rmodule.h>
#include <rules.h>
#include <string.h>
#include "misc.h"
@ -231,7 +233,15 @@ static int vboot_prepare(struct prog *prog)
if (stage == 0)
die("Vboot stage load failed.");
if (cbfs_load_prog_stage_by_offset(CBFS_DEFAULT_MEDIA,
if (ENV_ROMSTAGE && IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) {
struct rmod_stage_load rmod_ram = {
.cbmem_id = CBMEM_ID_RAMSTAGE,
.prog = prog,
};
if (rmodule_stage_load(&rmod_ram, (void *)stage))
die("Vboot couldn't load stage");
} else if (cbfs_load_prog_stage_by_offset(CBFS_DEFAULT_MEDIA,
prog, stage) < 0)
die("Vboot couldn't load stage");
}