vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: Separate TPM_TIS and TPM_TIS_ISA configs 

Let's separate the compilation of tpm_tis_common.c from
the compilation of tpm_tis_isa.c

The common part will be also compiled along with the
tpm_tis_sysbus device.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Message-id: 20200305165149.618-5-eric.auger@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
master
Eric Auger 2020-03-05 17:51:43 +01:00 committed by Stefan Berger
parent ac90053dcc
commit 2e8f7675b5
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default-configs/i386-softmmu.mak
View File

@ -20,7 +20,7 @@
#CONFIG_SGA=n
#CONFIG_TEST_DEVICES=n
#CONFIG_TPM_CRB=n
#CONFIG_TPM_TIS=n
#CONFIG_TPM_TIS_ISA=n
#CONFIG_VTD=n
# Boards:

2
hw/i386/Kconfig
View File

@ -20,7 +20,7 @@ config PC
imply SGA
imply TEST_DEVICES
imply TPM_CRB
imply TPM_TIS
imply TPM_TIS_ISA
imply VGA_PCI
imply VIRTIO_VGA
select FDC

7
hw/tpm/Kconfig
View File

@ -2,9 +2,14 @@ config TPMDEV
bool
depends on TPM
config TPM_TIS
config TPM_TIS_ISA
bool
depends on TPM && ISA_BUS
select TPM_TIS
config TPM_TIS
bool
depends on TPM
select TPMDEV
config TPM_CRB

3
hw/tpm/Makefile.objs
View File

@ -1,6 +1,7 @@
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_isa.o tpm_tis_common.o
common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o

4
tests/qtest/Makefile.include
View File

@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test
check-qtest-i386-y += vmgenid-test
check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector