diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-09-12 09:59:46 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-24 14:48:22 +0100 |
| commit | 1bbac3fd248ad7c91511d12c74b61c239ba3aa9f (patch) | |
| tree | c303d7309e703b9ee869dc255b09ade120690ee9 /src/vendorcode/google/chromeos/vboot_handoff.c | |
| parent | efddcfbb52cd328ad2eb86d88cd306ac30294109 (diff) | |
vboot2: Make struct vb2_working_data cpu architecture agnostic
this allows vb2_working_data to be accessed from stages running on different cpu
architectures.
BUG=none
TEST=Built firmware for Blaze with USE=+/-vboot2. Ran faft on Blaze.
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Change-Id: Ife2844637af8bf9e0d032a50fb516d98b8f80497
Original-Reviewed-on: https://chromium-review.googlesource.com/217835
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit 2b36749bc5a761003f00b7a0d17edb1629245b88)
Change-Id: Idc10f23ed2927717f5308f0112aa8113a683010e
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8882
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/google/chromeos/vboot_handoff.c')
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot_handoff.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot_handoff.c index ae3096aee2..f929a59a29 100644 --- a/src/vendorcode/google/chromeos/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot_handoff.c @@ -143,9 +143,10 @@ void *vboot_load_ramstage(void) { struct vboot_handoff *vh; struct vb2_shared_data *sd; + struct vboot_region fw_main; struct vb2_working_data *wd = vboot_get_working_data(); - sd = (struct vb2_shared_data *)wd->buffer; + sd = (struct vb2_shared_data *)(uintptr_t)wd->buffer; sd->workbuf_hash_offset = 0; sd->workbuf_hash_size = 0; @@ -167,5 +168,7 @@ void *vboot_load_ramstage(void) printk(BIOS_INFO, "loading ramstage from Slot %c\n", sd->fw_slot ? 'B' : 'A'); - return load_ramstage(vh, &wd->selected_region); + vb2_get_selected_region(wd, &fw_main); + + return load_ramstage(vh, &fw_main); } |