From patchwork Thu Dec 12 12:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208492 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bB55BewK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YZlM2pT0z9sPK for ; Fri, 13 Dec 2019 00:43:59 +1100 (AEDT) Received: from localhost ([::1]:59492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOl2-0007xj-P8 for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:43:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyu-0004Mj-NP for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyt-0007q6-K3 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:12 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyt-0007oW-CZ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:11 -0500 Received: by mail-wr1-x430.google.com with SMTP id c9so2604557wrw.8 for ; Thu, 12 Dec 2019 04:54:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7gkCOZ6HfKG25xVzS1LaU0MoLpk2e6Hmi4aWBpccGyI=; b=bB55BewKBun8y+zeAX+9qkn2U5gaOxA2JisV4rFFpUHQHXdOXUosmotfQeCM+nGVIi T9UL6ZI2vLCyel1vdhYENDxdEA8WQBm0ew8okOhliSVMK2Rt9Rj6PZsbzOP5Dv0eO9Sl HZ7TpkSTg7IzyOhxNsfKCn6c+AUzwnqtMga9nLserLL+hL/jQ6h0DMWWUYbMgJnKUrqD W8nwPijm00xmksn/Z3h3uEhQSD07Gm5CA5e32OIJQnyzUW+IPpygEt+/pxzNrVBUM4OH C1xYV3JYTtQoEJn+oyuoEIsEOURfayJqlIbu5Klhddoh4Jwhn9LFXIADqIOVRZzR9MPT twmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7gkCOZ6HfKG25xVzS1LaU0MoLpk2e6Hmi4aWBpccGyI=; b=VzCoBYphIkA9KifG47j6CRuOvxqt/Tc0HkEJhXnQjGx2kLeqY0C7Nb5mERsf1F3voU yl39WO5/+Lb3WTvh6lRxbBKLq4n4jk2EllT4RBsmqQ157bHRglNvWZg4AHaDjLdLBTvO mSBEFzG/n0oOOmstiJQdAIHKDnuRsKGfYQeEZHIPpxVr+u1Z5cLl7cUSS1Tg0aPJ0Pr2 B4+cUHOf6wYt/RvVURZWfOpSO8Tqx0t1x1kMRpzNMmH5vxu7h65ILjMPHefRCan6k2/H jVmJxVW+Nx6YP2RuY7OufCoVxlfyHijY1CBPmuxP8NRZB0XJN27M1Yse8hzskCvgzRRi ybQQ== X-Gm-Message-State: APjAAAVrCJK9cUlc9QUQx1mB85i1oN/b1FIiqfEa7n1FQyiiqvw/A+0U NX8Kb0Eh88oGst2PYc+ShS08N3tw X-Google-Smtp-Source: APXvYqxqMSwgukkJIGoHY96VHDPDOLK6iBrXWgznnIXx169zwgP3B/lKlXrU2nfRbQtyTK946HEgZA== X-Received: by 2002:adf:e591:: with SMTP id l17mr5704526wrm.139.1576155250082; Thu, 12 Dec 2019 04:54:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 072/132] meson: convert hw/tpm Date: Thu, 12 Dec 2019 13:51:56 +0100 Message-Id: <1576155176-2464-73-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/tpm/Makefile.objs | 6 ------ hw/tpm/meson.build | 7 +++++++ 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 hw/tpm/Makefile.objs create mode 100644 hw/tpm/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index df804a0..6529617 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -29,7 +29,6 @@ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ devices-dirs-y += ssi/ devices-dirs-y += timer/ -devices-dirs-$(CONFIG_TPM) += tpm/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 43797f9..4e918d0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('semihosting') subdir('smbios') +subdir('tpm') subdir('usb') subdir('vfio') subdir('virtio') diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs deleted file mode 100644 index de0b85d..0000000 --- a/hw/tpm/Makefile.objs +++ /dev/null @@ -1,6 +0,0 @@ -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 -common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build new file mode 100644 index 0000000..9ab7cd7 --- /dev/null +++ b/hw/tpm/meson.build @@ -0,0 +1,7 @@ +softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm_util.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis.c')) +softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) +softmmu_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c')) +softmmu_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c')) + +specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPMDEV'], if_true: files('tpm_ppi.c'))