From 183ad81cfe287e050596e4139c5d628b0aa488bc Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Mon, 17 Nov 2014 09:54:08 -0800 Subject: vboot2: update fw_version_tpm when creating vboot1 shared data This changes copies firmware version from vboot2 shared data to vboot1 shared data. This fixes FAFT firmware_TPMVersionCheck test. BUG=none BRANCH=ToT TEST=firmware_TPMVersionCheck passed on Nyan Kitty. Original-Change-Id: Idfd282931421dc16cd1aa82c7ccb6c6790a4d0d7 Original-Signed-off-by: Daisuke Nojiri Original-Reviewed-on: https://chromium-review.googlesource.com/230186 Original-Reviewed-by: Randall Spangler Original-Tested-by: Yen Lin (cherry picked from commit 1f590741893bee75d872184eba01c62e92455816) Signed-off-by: Aaron Durbin Change-Id: I205b651976d047923815efcd45b114cc7bf866e4 Reviewed-on: http://review.coreboot.org/9443 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/vendorcode/google/chromeos') diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index 7a61429d2f..326a9bb6c2 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -79,6 +79,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, vb_sd->struct_size = sizeof(VbSharedDataHeader); vb_sd->data_size = VB_SHARED_DATA_MIN_SIZE; vb_sd->data_used = sizeof(VbSharedDataHeader); + vb_sd->fw_version_tpm = vb2_sd->fw_version; if (get_write_protect_state()) vb_sd->flags |= VBSD_BOOT_FIRMWARE_WP_ENABLED; -- cgit v1.2.3