diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-08 17:40:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-08 17:40:05 +0100 |
| commit | f34edbc760b0f689deddd175fc08732ecb46665f (patch) | |
| tree | a3a5ae0a3c7caf13333013938b92902e851ff3f6 /hw | |
| parent | a4efdb6b24dceccd97f0a615a1752eb6fb92d46b (diff) | |
| parent | 2bb086f779e079851dd2fd5edb87864893278fb6 (diff) | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-07-08-1' into staging
Merge tpm 2019/07/08 v1
# gpg: Signature made Mon 08 Jul 2019 15:04:46 BST
# gpg: using RSA key 75AD65802A0B4211
# 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-2019-07-08-1:
hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/tpm/Makefile.objs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs index 700c878622..de0b85d02a 100644 --- a/hw/tpm/Makefile.objs +++ b/hw/tpm/Makefile.objs @@ -1,5 +1,5 @@ -common-obj-y += tpm_util.o -obj-y += tpm_ppi.o +common-obj-$(CONFIG_TPM) += tpm_util.o +obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o |