From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web10.7833.1578573656393157460 for ; Thu, 09 Jan 2020 04:40:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=YVbqzQ2x; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id p9so2759284wmc.2 for ; Thu, 09 Jan 2020 04:40:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Tr++ydc6NAum/RkDb1qfE2f9DhjM6WQZrkfZ3sh4ujA=; b=YVbqzQ2x68NcN5lC/x4NFhhh1NlLWUK/wqpK/CkI+f0VxX+LxoGOVk7UWglSDQrNKM GupBm+gprANurloSP9sXuM+zA9RbBIM7rwLUXBW/ataAP07x2TFS4txGhh73i+WfmBiO fgyKPf/P44giqASBb/tj8JzRJRuq+yU6O0d50reBSm4MiPjJUwM/Yq2VYeLMLEuEWwDf ZAKLy3RyMK7Y/KF06UCH86wJZ9pQZdbO3YkrloQMYaX0NVM8jiDdEwbvk3cHVTiJYMNi zX2xBekXNZfN5En5eqKsqDbepouc1t5O2zSJT/Ylt3CJn2YXDtl59AbCsENzxixJQsV6 UzoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Tr++ydc6NAum/RkDb1qfE2f9DhjM6WQZrkfZ3sh4ujA=; b=dqVtysiKUAtNpmnqLbFN7En10ddBMxMoYnZBxER0abFwqhy3bveRTkvN2Yeq7UxBzM pi0Kqv8Q1DlCS++xx9QzV53hXw61ZqCx6E1pNVudHSZ1+D8/N8pjunoQ2fBQGgHkzFAJ b04k+mtbpFRnM/UIhwd8l3F9AV4LfZVvjIqIukgAcMJH59YL5otgzHHm35K0hzbFMqfN 4946Su5XsLbOPBXEd/O1/uATDKMpz8w3R986aRt/K/iYfaR898vavt4CUDkTl2JX/ivx Y3I6eL5oBNyRLD4zPZrWHp8T0mIUrucbzeoczrgWUXm743T26EGSDlVYx2wlQFmkurmR nE1g== X-Gm-Message-State: APjAAAWnwwSwHaCnhh1Hh8g4iic9QR6lHAfUSgwy0ZuCzKEPMfWAEplw zAzoaKHSaa2eu4+/LvbutBpMsffBlisFuU7lyl+D2A== X-Google-Smtp-Source: APXvYqzmmqRyfYeShggfdPXW+4n7XbITLYJJBZ8ZNltjGui1nKqaBk5lFTHfRUyd0sTWYN6rQ2B9Pl+2PY4CWKnf9GU= X-Received: by 2002:a1c:7901:: with SMTP id l1mr4605909wme.67.1578573654871; Thu, 09 Jan 2020 04:40:54 -0800 (PST) MIME-Version: 1.0 References: <20200108143843.4198-1-ard.biesheuvel@linaro.org> <20200108143843.4198-2-ard.biesheuvel@linaro.org> <31baf73e-3d53-e66e-d1b5-6f16a40f5973@redhat.com> In-Reply-To: <31baf73e-3d53-e66e-d1b5-6f16a40f5973@redhat.com> From: "Ard Biesheuvel" Date: Thu, 9 Jan 2020 13:40:43 +0100 Message-ID: Subject: Re: [PATCH 1/2] OvmfPkg: reorganize TPM2 support in DSC/FDF files To: Laszlo Ersek Cc: edk2-devel-groups-io , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" On Thu, 9 Jan 2020 at 13:38, Laszlo Ersek wrote: > > Hi Ard, > > On 01/08/20 15:38, Ard Biesheuvel wrote: > > Put the TPM2 related DXE modules together in the DSC, and add a > > TPM2 support header comment while at it. > > > > Signed-off-by: Ard Biesheuvel > > --- > > OvmfPkg/OvmfPkgIa32.dsc | 9 ++++++--- > > OvmfPkg/OvmfPkgIa32X64.dsc | 9 ++++++--- > > OvmfPkg/OvmfPkgX64.dsc | 3 +++ > > I think you forgot to stage some of the changes for "OvmfPkgX64.dsc" > before committing the patch: > > > OvmfPkg/OvmfPkgIa32.fdf | 3 +++ > > OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++ > > OvmfPkg/OvmfPkgX64.fdf | 3 +++ > > 6 files changed, 24 insertions(+), 6 deletions(-) > > > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > > index 9a60eb8fe2b0..f9e0b4b5bc54 100644 > > --- a/OvmfPkg/OvmfPkgIa32.dsc > > +++ b/OvmfPkg/OvmfPkgIa32.dsc > > @@ -632,9 +632,6 @@ [Components] > > NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf > > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > > } > > -!if $(TPM2_CONFIG_ENABLE) == TRUE > > - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > > -!endif > > !endif > > > > # > > @@ -902,6 +899,9 @@ [Components] > > } > > !endif > > > > + # > > + # TPM2 support > > + # > > !if $(TPM2_ENABLE) == TRUE > > SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { > > > > @@ -914,4 +914,7 @@ [Components] > > NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf > > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > > } > > +!if $(TPM2_CONFIG_ENABLE) == TRUE > > + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > > +!endif > > !endif > > > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > > index 1d1480b50b02..ee83bbaa5379 100644 > > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > > @@ -644,9 +644,6 @@ [Components.IA32] > > NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf > > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > > } > > -!if $(TPM2_CONFIG_ENABLE) == TRUE > > - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > > -!endif > > !endif > > > > [Components.X64] > > @@ -916,6 +913,9 @@ [Components.X64] > > } > > !endif > > > > + # > > + # TPM2 support > > + # > > !if $(TPM2_ENABLE) == TRUE > > SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { > > > > @@ -928,4 +928,7 @@ [Components.X64] > > NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf > > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > > } > > +!if $(TPM2_CONFIG_ENABLE) == TRUE > > + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > > +!endif > > !endif > > > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > > index c287a436f8ec..2b6106ff313f 100644 > > --- a/OvmfPkg/OvmfPkgX64.dsc > > +++ b/OvmfPkg/OvmfPkgX64.dsc > > @@ -914,6 +914,9 @@ [Components] > > } > > !endif > > > > + # > > + # TPM2 support > > + # > > !if $(TPM2_ENABLE) == TRUE > > SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { > > > > The new comment is identical to the new comments in the other two DSC > files, but the moving around of > "SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf" (in two hunks) is missing > from "OvmfPkgX64.dsc". > Ugh yes, I will fix up and resend. > Thank you for spending time on this! > Laszlo >