From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web10.6388.1582713660305818222 for ; Wed, 26 Feb 2020 02:41:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=C6p4KXWp; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582713659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/5Io/fQmKVPAxJM9pNvtiYLJ4slKaEDH8Qk9KhE40H8=; b=C6p4KXWpcPs0SyH6MxN4AI2ks2oOx8tRnfkoYb37yT27iCOeyzZJhpi1PtOog/zrxKwjOy r11vAXUwnM99JY2+468PnX6S47Jvm/M8pYWLozsoNP9A8XHcDk3MY7SaAliUE1TGmpBZtm k0xchpOPUIJdacATegQg9ePhMc2KgWA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-305-PDvjyYSAPDCQDkxccQndCQ-1; Wed, 26 Feb 2020 05:40:58 -0500 X-MC-Unique: PDvjyYSAPDCQDkxccQndCQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4CEB801E72; Wed, 26 Feb 2020 10:40:56 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-185.ams2.redhat.com [10.36.116.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEC149297C; Wed, 26 Feb 2020 10:40:52 +0000 (UTC) Subject: Re: [PATCH v3 4/6] OvmfPkg: include TcgDxe module To: marcandre.lureau@redhat.com, devel@edk2.groups.io Cc: simon.hardy@itdev.co.uk, stefanb@linux.ibm.com References: <20200226093459.1131530-1-marcandre.lureau@redhat.com> <20200226093459.1131530-5-marcandre.lureau@redhat.com> From: "Laszlo Ersek" Message-ID: Date: Wed, 26 Feb 2020 11:40:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200226093459.1131530-5-marcandre.lureau@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 02/26/20 10:34, marcandre.lureau@redhat.com wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > Mirrors TPM 2.0 commit 0c0a50d6b3ff ("OvmfPkg: include Tcg2Dxe > module", 2018-03-09). >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > OvmfPkg/OvmfPkgIa32.dsc | 5 +++++ > OvmfPkg/OvmfPkgIa32.fdf | 1 + > OvmfPkg/OvmfPkgIa32X64.dsc | 5 +++++ > OvmfPkg/OvmfPkgIa32X64.fdf | 1 + > OvmfPkg/OvmfPkgX64.dsc | 5 +++++ > OvmfPkg/OvmfPkgX64.fdf | 1 + > 6 files changed, 18 insertions(+) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 467de6860e1d..11ae66109bc3 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -363,6 +363,7 @@ > MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.i= nf > !if $(TPM_ENABLE) =3D=3D TRUE > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg= .inf > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.= inf > !endif > =20 > @@ -930,4 +931,8 @@ > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > !endif > + SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { > + > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceL= ibDTpm.inf > + } > !endif > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index e851598f9b01..b0ddc5a4ae73 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -348,6 +348,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf > # TPM support > # > !if $(TPM_ENABLE) =3D=3D TRUE > +INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf > INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index a6372c3729ef..16a3ae1fdda1 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -368,6 +368,7 @@ > MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.i= nf > !if $(TPM_ENABLE) =3D=3D TRUE > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg= .inf > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.= inf > !endif > =20 > @@ -944,4 +945,8 @@ > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > !endif > + SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { > + > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceL= ibDTpm.inf > + } > !endif > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 1e7a77d35c0f..dffbfaa5fc4f 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -355,6 +355,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf > # TPM support > # > !if $(TPM_ENABLE) =3D=3D TRUE > +INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf > INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 5daf8b2bc835..164f74e438bb 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -368,6 +368,7 @@ > MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.i= nf > !if $(TPM_ENABLE) =3D=3D TRUE > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg= .inf > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.= inf > !endif > =20 > @@ -942,4 +943,8 @@ > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > !endif > + SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { > + > + Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceL= ibDTpm.inf > + } > !endif > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 1e7a77d35c0f..dffbfaa5fc4f 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -355,6 +355,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf > # TPM support > # > !if $(TPM_ENABLE) =3D=3D TRUE > +INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf > INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > !if $(TPM_CONFIG_ENABLE) =3D=3D TRUE > INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf >=20 Reviewed-by: Laszlo Ersek