Commit 7f061e0d authored by Simon Glass's avatar Simon Glass Committed by Bin Meng
Browse files

x86: acpi: Include the TPMv1 table only if needed



This table is not needed if a v2 TPM is in use. Add a condition to avoid
adding it when not needed.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarBin Meng <bmeng.cn@gmail.com>
parent 1da448bb
...@@ -646,14 +646,17 @@ ulong write_acpi_tables(ulong start_addr) ...@@ -646,14 +646,17 @@ ulong write_acpi_tables(ulong start_addr)
acpi_inc_align(ctx, madt->header.length); acpi_inc_align(ctx, madt->header.length);
acpi_add_table(ctx, madt); acpi_add_table(ctx, madt);
debug("ACPI: * TCPA\n"); if (IS_ENABLED(CONFIG_TPM_V1)) {
tcpa = (struct acpi_tcpa *)ctx->current; debug("ACPI: * TCPA\n");
ret = acpi_create_tcpa(tcpa); tcpa = (struct acpi_tcpa *)ctx->current;
if (ret) { ret = acpi_create_tcpa(tcpa);
log_warning("Failed to create TCPA table (err=%d)\n", ret); if (ret) {
} else { log_warning("Failed to create TCPA table (err=%d)\n",
acpi_inc_align(ctx, tcpa->header.length); ret);
acpi_add_table(ctx, tcpa); } else {
acpi_inc_align(ctx, tcpa->header.length);
acpi_add_table(ctx, tcpa);
}
} }
debug("ACPI: * CSRT\n"); debug("ACPI: * CSRT\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment