소스 검색

meson: convert hw/tpm

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 5 년 전
부모
커밋
70c2cfedd3
4개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제
  1. 0 1
      hw/Makefile.objs
  2. 1 0
      hw/meson.build
  3. 0 6
      hw/tpm/Makefile.objs
  4. 8 0
      hw/tpm/meson.build

+ 0 - 1
hw/Makefile.objs

@@ -29,7 +29,6 @@ devices-dirs-$(CONFIG_SCSI) += scsi/
 devices-dirs-y += sd/
 devices-dirs-y += sd/
 devices-dirs-y += ssi/
 devices-dirs-y += ssi/
 devices-dirs-y += timer/
 devices-dirs-y += timer/
-devices-dirs-$(CONFIG_TPM) += tpm/
 endif
 endif
 
 
 common-obj-y += $(devices-dirs-y)
 common-obj-y += $(devices-dirs-y)

+ 1 - 0
hw/meson.build

@@ -3,6 +3,7 @@ subdir('mem')
 subdir('nubus')
 subdir('nubus')
 subdir('semihosting')
 subdir('semihosting')
 subdir('smbios')
 subdir('smbios')
+subdir('tpm')
 subdir('usb')
 subdir('usb')
 subdir('vfio')
 subdir('vfio')
 subdir('virtio')
 subdir('virtio')

+ 0 - 6
hw/tpm/Makefile.objs

@@ -1,6 +0,0 @@
-obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
-common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
-common-obj-$(CONFIG_TPM_TIS_SYSBUS) += tpm_tis_sysbus.o
-common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
-common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
-obj-$(CONFIG_TPM_SPAPR) += tpm_spapr.o

+ 8 - 0
hw/tpm/meson.build

@@ -0,0 +1,8 @@
+softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c'))
+softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c'))
+
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true: files('tpm_ppi.c'))
+specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true: files('tpm_ppi.c'))
+specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c'))