From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 8 Jul 2019 16:40:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-07-08-1' into... 
X-Git-Tag: v4.1.0~63
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f34edbc760b0f689deddd175fc08732ecb46665f;p=mirror_qemu.git

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>
---

f34edbc760b0f689deddd175fc08732ecb46665f