diff options
| author | Joel Kitching <kitching@google.com> | 2020-03-05 19:33:51 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-06 13:50:53 +0000 |
| commit | 4da0add3b390e9aecd2113375abae874318c7cf4 (patch) | |
| tree | d6aa9510b7300989de0c9955312e55fb993cbfa1 | |
| parent | 9d0700c03377aa35cebdcd4165834737cbae6ff7 (diff) | |
| download | vboot-4da0add3b390e9aecd2113375abae874318c7cf4.tar.gz | |
vboot: stop setting VBSD_BOOT_FIRMWARE_WP_ENABLED
wpsw_boot is being deprecated in favour of using wpsw_cur.
Remove the wp_enabled argument from vb2api_export_vbsd
and stop setting VBSD_BOOT_FIRMWARE_WP_ENABLED in VBSD.
BUG=b:124141368, chromium:950273
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib3c7f43b5fb2af519bca93d5bbd95db5eff241a3
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:2088434
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2087141
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/2misc.c | 4 | ||||
| -rw-r--r-- | firmware/2lib/include/2api.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index 7a8c295f..faf2da7e 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -456,7 +456,7 @@ uint32_t vb2api_get_recovery_reason(struct vb2_context *ctx) return vb2_get_sd(ctx)->recovery_reason; } -void vb2api_export_vbsd(struct vb2_context *ctx, int wp_enabled, void *dest) +void vb2api_export_vbsd(struct vb2_context *ctx, void *dest) { struct vb2_shared_data *sd = vb2_get_sd(ctx); VbSharedDataHeader *vbsd = (void *)dest; @@ -481,8 +481,6 @@ void vb2api_export_vbsd(struct vb2_context *ctx, int wp_enabled, void *dest) vbsd->flags |= VBSD_BOOT_REC_SWITCH_ON; if (sd->flags & VB2_SD_FLAG_KERNEL_SIGNED) vbsd->flags |= VBSD_KERNEL_KEY_VERIFIED; - if (wp_enabled) - vbsd->flags |= VBSD_BOOT_FIRMWARE_WP_ENABLED; vbsd->fw_version_tpm_start = sd->fw_version_secdata; vbsd->fw_version_tpm = sd->fw_version; diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 2a9a476e..e19fcf74 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -483,10 +483,9 @@ vb2_error_t vb2api_relocate(void *new_workbuf, const void *cur_workbuf, * the memory available to be of size VB2_VBSD_SIZE. * * @param ctx Context pointer - * @param wp_enabled Whether or not write-protect is enabled at boot time * @param dest Target memory to store VbSharedDataHeader */ -void vb2api_export_vbsd(struct vb2_context *ctx, int wp_enabled, void *dest); +void vb2api_export_vbsd(struct vb2_context *ctx, void *dest); /** * Check the validity of firmware secure storage context. |