diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-15 16:33:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-15 16:33:05 +0100 |
| commit | 1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a (patch) | |
| tree | 1ea8462dca5bf1f009dc9a08c07194cc96fb0433 /include/hw | |
| parent | 1ea06abceec61b6f3ab33dadb0510b6e09fb61e2 (diff) | |
| parent | caff255a546d12530cf7c28e60690cd0e65851fd (diff) | |
| download | focaccia-qemu-1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a.tar.gz focaccia-qemu-1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-06-15-1' into staging
Merge tpm 2021/06/15 v1 # gpg: Signature made Tue 15 Jun 2021 16:09:31 BST # gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211 # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211 * remotes/stefanberger/tags/pull-tpm-2021-06-15-1: tpm: Return QMP error when TPM is disabled in build sysemu: Make TPM structures inaccessible if CONFIG_TPM is not defined acpi: Eliminate all TPM related code if CONFIG_TPM is not set arm: Eliminate all TPM related code if CONFIG_TPM is not set i386: Eliminate all TPM related code if CONFIG_TPM is not set Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/acpi/tpm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 1a2a57a21f..559ba6906c 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -21,6 +21,8 @@ #include "hw/acpi/aml-build.h" #include "sysemu/tpm.h" +#ifdef CONFIG_TPM + #define TPM_TIS_ADDR_BASE 0xFED40000 #define TPM_TIS_ADDR_SIZE 0x5000 @@ -209,4 +211,6 @@ REG32(CRB_DATA_BUFFER, 0x80) void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev); +#endif /* CONFIG_TPM */ + #endif /* HW_ACPI_TPM_H */ |