[coreboot-gerrit] New patch to review for coreboot: 65e8701 vboot: handle RELOCATABLE_RAMSTAGE

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10184

-gerrit

commit 65e870151548f426f04b1c75b876a1726c7a163e
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue May 12 16:43:10 2015 -0500

    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 at chromium.org>
---
 src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
index 505c9c0..9e60472 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
@@ -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");
 	}