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 <ard.biesheuvel@linaro.org>
---
OvmfPkg/OvmfPkgIa32.dsc | 9 ++++++---
OvmfPkg/OvmfPkgIa32X64.dsc | 9 ++++++---
OvmfPkg/OvmfPkgX64.dsc | 3 +++
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 {
<LibraryClasses>
@@ -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 {
<LibraryClasses>
@@ -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 {
<LibraryClasses>
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 586bbff08585..63607551ed75 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -343,6 +343,9 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
!endif
+#
+# TPM2 support
+#
!if $(TPM2_ENABLE) == TRUE
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
!if $(TPM2_CONFIG_ENABLE) == TRUE
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index e49adc425fce..0488e5d95ffe 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -350,6 +350,9 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
!endif
+#
+# TPM2 support
+#
!if $(TPM2_ENABLE) == TRUE
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
!if $(TPM2_CONFIG_ENABLE) == TRUE
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index e49adc425fce..0488e5d95ffe 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -350,6 +350,9 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
!endif
+#
+# TPM2 support
+#
!if $(TPM2_ENABLE) == TRUE
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
!if $(TPM2_CONFIG_ENABLE) == TRUE
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53021): https://edk2.groups.io/g/devel/message/53021
Mute This Topic: https://groups.io/mt/69529189/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
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 <ard.biesheuvel@linaro.org>
> ---
> 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 {
> <LibraryClasses>
> @@ -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 {
> <LibraryClasses>
> @@ -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 {
> <LibraryClasses>
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".
Thank you for spending time on this!
Laszlo
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53072): https://edk2.groups.io/g/devel/message/53072
Mute This Topic: https://groups.io/mt/69529189/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
On Thu, 9 Jan 2020 at 13:38, Laszlo Ersek <lersek@redhat.com> 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 <ard.biesheuvel@linaro.org>
> > ---
> > 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 {
> > <LibraryClasses>
> > @@ -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 {
> > <LibraryClasses>
> > @@ -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 {
> > <LibraryClasses>
>
> 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
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53073): https://edk2.groups.io/g/devel/message/53073
Mute This Topic: https://groups.io/mt/69529189/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
On 01/09/20 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 <ard.biesheuvel@linaro.org>
>> ---
>> 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 {
>> <LibraryClasses>
>> @@ -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 {
>> <LibraryClasses>
>> @@ -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 {
>> <LibraryClasses>
>
> 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".
With that fixed, you can add:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53075): https://edk2.groups.io/g/devel/message/53075
Mute This Topic: https://groups.io/mt/69529189/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2026 Red Hat, Inc.