From ceaabc94efec339f75732dd7bf72c51f8dc52941 Mon Sep 17 00:00:00 2001 From: Gediminas Ramanauskas Date: Tue, 4 Nov 2014 20:07:09 -0800 Subject: vboot: adding VBSD_BOOT_FIRMWARE_WP_ENABLED logic BUG=chrome-os-partner:33395 BRANCH=none TEST=emerge and test using crossystem Original-Change-Id: I0d49f85219d45c837a7100e0195bef86da2c6cdd Original-Signed-off-by: Gediminas Ramanauskas Original-Reviewed-on: https://chromium-review.googlesource.com/227546 Original-Reviewed-by: Aaron Durbin (cherry picked from commit 5a2868e04140973691136adfd7d9e6d1aa1f6dae) Signed-off-by: Aaron Durbin Change-Id: I93c1ea9ce1270c2c143fd44ead2291dfbc114c00 Reviewed-on: http://review.coreboot.org/9437 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/vendorcode/google/chromeos/vboot2/vboot_handoff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c index a8573d0c88..7a61429d2f 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c @@ -59,7 +59,7 @@ static void *load_ramstage(struct vboot_handoff *vboot_handoff, /** * Sets vboot_handoff based on the information in vb2_shared_data * - * TODO: Read wp switch to set VBSD_BOOT_FIRMWARE_WP_ENABLED + * TODO: Add VBSD_BOOT_FIRMWARE_SW_WP_ENABLED logic */ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, struct vb2_shared_data *vb2_sd) @@ -80,6 +80,9 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, vb_sd->data_size = VB_SHARED_DATA_MIN_SIZE; vb_sd->data_used = sizeof(VbSharedDataHeader); + if (get_write_protect_state()) + vb_sd->flags |= VBSD_BOOT_FIRMWARE_WP_ENABLED; + if (vb2_sd->recovery_reason) { vb_sd->firmware_index = 0xFF; if (vb2_sd->recovery_reason == VB2_RECOVERY_RO_MANUAL) -- cgit v1.2.3