diff options
| author | Peter Maydell | 2017-10-26 10:20:11 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-26 10:20:11 +0200 |
| commit | 325a084c1ebccb265a3c8f1dd092ffbbfb448a00 (patch) | |
| tree | cb94a661c36efc359ba4147d7d93493e4b3ca955 /Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20171025' into staging (diff) | |
| parent | tpm: print buffers received from TPM when debugging (diff) | |
| download | qemu-325a084c1ebccb265a3c8f1dd092ffbbfb448a00.tar.gz qemu-325a084c1ebccb265a3c8f1dd092ffbbfb448a00.tar.xz qemu-325a084c1ebccb265a3c8f1dd092ffbbfb448a00.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-10-24-1' into staging
Merge tpm 2017/10/24 v1
# gpg: Signature made Wed 25 Oct 2017 06:06:55 BST
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# 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-2017-10-24-1:
tpm: print buffers received from TPM when debugging
vl: remove unnecessary #ifdef CONFIG_TPM
tpm: remove unnecessary #ifdef CONFIG_TPM
tpm: add stubs
tpm: add missing include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index d4f973a8fc..285c6f3c15 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -62,7 +62,7 @@ bt-host.o-cflags := $(BLUEZ_CFLAGS) common-obj-y += dma-helpers.o common-obj-y += vl.o vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) -common-obj-y += tpm.o +common-obj-$(CONFIG_TPM) += tpm.o common-obj-$(CONFIG_SLIRP) += slirp/ |