aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-08 12:56:39 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-08 12:56:39 +0000
commit0ab4537f08e09b13788db67efd760592fb7db769 (patch)
tree0fd47e86cb4ef9c9147f6beaf731bb3764985f18 /Makefile.objs
parent3ef91576b96de7051dacc2132cddfb486b46e863 (diff)
parentfcbed221ff7230c6a5ebfb2ed27dc114ff5a30b0 (diff)
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-03-07-1' into staging
Merge tpm 2018/03/07 # gpg: Signature made Wed 07 Mar 2018 12:42:13 GMT # gpg: using RSA key 75AD65802A0B4211 # 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-2018-03-07-1: tpm: convert tpm_tis.c to use trace-events tpm: convert tpm_emulator.c to use trace-events tpm: convert tpm_util.c to use trace-events tpm: convert tpm_passthrough.c to use trace-events tpm: convert tpm_crb.c to use trace-events Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 69413d33b1..d8b44a2d3c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -233,6 +233,7 @@ trace-events-subdirs += hw/alpha
trace-events-subdirs += hw/hppa
trace-events-subdirs += hw/xen
trace-events-subdirs += hw/ide
+trace-events-subdirs += hw/tpm
trace-events-subdirs += ui
trace-events-subdirs += audio
trace-events-subdirs += net