jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

authored by

Eric Auger and committed by
Stefan Berger 2e8f7675 ac90053d

+12 -6
+1 -1
default-configs/i386-softmmu.mak
··· 20 20 #CONFIG_SGA=n 21 21 #CONFIG_TEST_DEVICES=n 22 22 #CONFIG_TPM_CRB=n 23 - #CONFIG_TPM_TIS=n 23 + #CONFIG_TPM_TIS_ISA=n 24 24 #CONFIG_VTD=n 25 25 26 26 # Boards:
+1 -1
hw/i386/Kconfig
··· 20 20 imply SGA 21 21 imply TEST_DEVICES 22 22 imply TPM_CRB 23 - imply TPM_TIS 23 + imply TPM_TIS_ISA 24 24 imply VGA_PCI 25 25 imply VIRTIO_VGA 26 26 select FDC
+6 -1
hw/tpm/Kconfig
··· 2 2 bool 3 3 depends on TPM 4 4 5 + config TPM_TIS_ISA 6 + bool 7 + depends on TPM && ISA_BUS 8 + select TPM_TIS 9 + 5 10 config TPM_TIS 6 11 bool 7 - depends on TPM && ISA_BUS 12 + depends on TPM 8 13 select TPMDEV 9 14 10 15 config TPM_CRB
+2 -1
hw/tpm/Makefile.objs
··· 1 1 common-obj-$(CONFIG_TPM) += tpm_util.o 2 2 obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o 3 - common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o 3 + common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o 4 + common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o 4 5 common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o 5 6 common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o 6 7 common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
+2 -2
tests/qtest/Makefile.include
··· 54 54 check-qtest-i386-y += vmgenid-test 55 55 check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test 56 56 check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test 57 - check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test 58 - check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test 57 + check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test 58 + check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test 59 59 check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter 60 60 check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror 61 61 check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector