[Qemu-devel] [PULL v1 0/1] Merge tpm 2019/07/08 v1

[Qemu-devel] [PULL v1 0/1] Merge tpm 2019/07/08 v1

[Stefan Berger]

The following changes since commit 506179e42112be77bfd071f050b15762d3b2cd43:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190702' into staging (2019-07-02 18:56:44 +0100)

are available in the Git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2019-07-08-1

for you to fetch changes up to 2bb086f779e079851dd2fd5edb87864893278fb6:

  hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built (2019-07-08 10:04:38 -0400)

----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
      hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built

 hw/tpm/Makefile.objs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

[Qemu-devel] [PULL v1 1/1] hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built

[Stefan Berger]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

The TPM Physical Presence Interface routines are only used
by the CRB/TIS interfaces. Do not compile this file if any
of them is built.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 hw/tpm/Makefile.objs | 4 ++--
 1 file 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
-- 
2.20.1

Re: [Qemu-devel] [PULL v1 0/1] Merge tpm 2019/07/08 v1

[Peter Maydell]

On Mon, 8 Jul 2019 at 17:36, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
>
> The following changes since commit 506179e42112be77bfd071f050b15762d3b2cd43:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190702' into staging (2019-07-02 18:56:44 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2019-07-08-1
>
> for you to fetch changes up to 2bb086f779e079851dd2fd5edb87864893278fb6:
>
>   hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built (2019-07-08 10:04:38 -0400)
>
> ----------------------------------------------------------------
> Philippe Mathieu-Daudé (1):
>       hw/tpm: Only build tpm_ppi.o if any of TPM_TIS/TPM_CRB is built
>
>  hw/tpm/Makefile.objs | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM