diff options
Diffstat (limited to 'firmware/lib/vboot_ui.c')
| -rw-r--r-- | firmware/lib/vboot_ui.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index 2c99884f..55b09e94 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -12,7 +12,6 @@ #include "2secdata.h" #include "2sysincludes.h" #include "load_kernel_fw.h" -#include "secdata_tpm.h" #include "tlcl.h" #include "utility.h" #include "vb2_common.h" @@ -468,16 +467,7 @@ static vb2_error_t vb2_diagnostics_ui(struct vb2_context *ctx) if (action_confirmed) { VB2_DEBUG("Diagnostic requested, running\n"); - /* - * The following helps avoid use of the TPM after - * it's disabled (e.g., when vb2_try_altfw() calls - * secdata_kernel_lock() ). - */ - - if (secdata_kernel_lock(ctx)) { - VB2_DEBUG("Failed to lock TPM PP\n"); - vb2api_fail(ctx, VB2_RECOVERY_TPM_DISABLE_FAILED, 0); - } else if (vb2ex_tpm_set_mode(VB2_TPM_MODE_DISABLED) != + if (vb2ex_tpm_set_mode(VB2_TPM_MODE_DISABLED) != VB2_SUCCESS) { VB2_DEBUG("Failed to disable TPM\n"); vb2api_fail(ctx, VB2_RECOVERY_TPM_DISABLE_FAILED, 0); |