ovmf: fix tpm PACKAGECONFIG to use TPM2_ENABLE

The tpm PACKAGECONFIG passed "-D TPM_ENABLE=TRUE/FALSE", but ovmf
renamed that macro to TPM2_ENABLE in edk2 commit 4de8d61bcec0
("OvmfPkg: rework TPM configuration", first released in
edk2-stable202202). Since then TPM_ENABLE has been an unknown macro
that edk2 ignores, so TPM2 support was never compiled in, even for
MACHINEs with 'tpm'/'tpm2' in MACHINE_FEATURES.

Use TPM2_ENABLE (as defined in
OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc and consumed by
OvmfPkgX64.dsc) so the tpm PACKAGECONFIG actually enables TPM2 support.

The same commit also added a separate TPM1_ENABLE macro (TPM 1.2
support, default TRUE), but its dsc.inc snippets are only included
inside OvmfPkgX64.dsc's "!if $(TPM2_ENABLE) == TRUE" block, so it has
no effect unless TPM2_ENABLE is TRUE. No separate PACKAGECONFIG knob is
needed.

I'm sending a backport to wrynose of this in another email.

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
---
 meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On Wed Jul 8, 2026 at 4:22 PM CEST, Eilís 'pidge' Ní Fhlannagáin via lists.openembedded.org wrote:
> The tpm PACKAGECONFIG passed "-D TPM_ENABLE=TRUE/FALSE", but ovmf
> renamed that macro to TPM2_ENABLE in edk2 commit 4de8d61bcec0
> ("OvmfPkg: rework TPM configuration", first released in
> edk2-stable202202). Since then TPM_ENABLE has been an unknown macro
> that edk2 ignores, so TPM2 support was never compiled in, even for
> MACHINEs with 'tpm'/'tpm2' in MACHINE_FEATURES.

Hello,

By looking at the version only, should'nt this be backported to
scarthgap as well? It has ovmf edk2-stable202402.

Thanks!

>
> Use TPM2_ENABLE (as defined in
> OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc and consumed by
> OvmfPkgX64.dsc) so the tpm PACKAGECONFIG actually enables TPM2 support.
>
> The same commit also added a separate TPM1_ENABLE macro (TPM 1.2
> support, default TRUE), but its dsc.inc snippets are only included
> inside OvmfPkgX64.dsc's "!if $(TPM2_ENABLE) == TRUE" block, so it has
> no effect unless TPM2_ENABLE is TRUE. No separate PACKAGECONFIG knob is
> needed.
>
> I'm sending a backport to wrynose of this in another email.
>
> Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
> ---
>  meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
> index bda33e2631..ab276bad1f 100644
> --- a/meta/recipes-core/ovmf/ovmf_git.bb
> +++ b/meta/recipes-core/ovmf/ovmf_git.bb
> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776
>  PACKAGECONFIG ??= "${@bb.utils.contains_any('MACHINE_FEATURES', 'tpm tpm2', 'tpm', '', d)}"
>  PACKAGECONFIG[debug] = ",,,"
>  PACKAGECONFIG[secureboot] = ",,,"
> -PACKAGECONFIG[tpm] = "-D TPM_ENABLE=TRUE,-D TPM_ENABLE=FALSE,,"
> +PACKAGECONFIG[tpm] = "-D TPM2_ENABLE=TRUE,-D TPM2_ENABLE=FALSE,,"
>  
>  SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https;tag=${PV} \
>             file://0001-ovmf-update-path-to-native-BaseTools.patch \

On Fri, 10 Jul 2026 at 11:02, Yoann Congal <yoann.congal@smile.fr> wrote:
>
> On Wed Jul 8, 2026 at 4:22 PM CEST, Eilís 'pidge' Ní Fhlannagáin via lists.openembedded.org wrote:
> > The tpm PACKAGECONFIG passed "-D TPM_ENABLE=TRUE/FALSE", but ovmf
> > renamed that macro to TPM2_ENABLE in edk2 commit 4de8d61bcec0
> > ("OvmfPkg: rework TPM configuration", first released in
> > edk2-stable202202). Since then TPM_ENABLE has been an unknown macro
> > that edk2 ignores, so TPM2 support was never compiled in, even for
> > MACHINEs with 'tpm'/'tpm2' in MACHINE_FEATURES.
>
> Hello,
>
> By looking at the version only, should'nt this be backported to
> scarthgap as well? It has ovmf edk2-stable202402.
>

Yes, I wasn't looking at scarthgap, but yes, if it has
edk2-stable202402, then it should be applied there as well.

-e

> Thanks!
>
> >
> > Use TPM2_ENABLE (as defined in
> > OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc and consumed by
> > OvmfPkgX64.dsc) so the tpm PACKAGECONFIG actually enables TPM2 support.
> >
> > The same commit also added a separate TPM1_ENABLE macro (TPM 1.2
> > support, default TRUE), but its dsc.inc snippets are only included
> > inside OvmfPkgX64.dsc's "!if $(TPM2_ENABLE) == TRUE" block, so it has
> > no effect unless TPM2_ENABLE is TRUE. No separate PACKAGECONFIG knob is
> > needed.
> >
> > I'm sending a backport to wrynose of this in another email.
> >
> > Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
> > ---
> >  meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
> > index bda33e2631..ab276bad1f 100644
> > --- a/meta/recipes-core/ovmf/ovmf_git.bb
> > +++ b/meta/recipes-core/ovmf/ovmf_git.bb
> > @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776
> >  PACKAGECONFIG ??= "${@bb.utils.contains_any('MACHINE_FEATURES', 'tpm tpm2', 'tpm', '', d)}"
> >  PACKAGECONFIG[debug] = ",,,"
> >  PACKAGECONFIG[secureboot] = ",,,"
> > -PACKAGECONFIG[tpm] = "-D TPM_ENABLE=TRUE,-D TPM_ENABLE=FALSE,,"
> > +PACKAGECONFIG[tpm] = "-D TPM2_ENABLE=TRUE,-D TPM2_ENABLE=FALSE,,"
> >
> >  SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https;tag=${PV} \
> >             file://0001-ovmf-update-path-to-native-BaseTools.patch \
>
>
> --
> Yoann Congal
> Smile ECS
>

Le ven. 10 juil. 2026 à 14:00, Eilís Ní Fhlannagáin <pidge@baylibre.com> a
écrit :

> On Fri, 10 Jul 2026 at 11:02, Yoann Congal <yoann.congal@smile.fr> wrote:
> >
> > On Wed Jul 8, 2026 at 4:22 PM CEST, Eilís 'pidge' Ní Fhlannagáin via
> lists.openembedded.org wrote:
> > > The tpm PACKAGECONFIG passed "-D TPM_ENABLE=TRUE/FALSE", but ovmf
> > > renamed that macro to TPM2_ENABLE in edk2 commit 4de8d61bcec0
> > > ("OvmfPkg: rework TPM configuration", first released in
> > > edk2-stable202202). Since then TPM_ENABLE has been an unknown macro
> > > that edk2 ignores, so TPM2 support was never compiled in, even for
> > > MACHINEs with 'tpm'/'tpm2' in MACHINE_FEATURES.
> >
> > Hello,
> >
> > By looking at the version only, should'nt this be backported to
> > scarthgap as well? It has ovmf edk2-stable202402.
> >
>
> Yes, I wasn't looking at scarthgap, but yes, if it has
> edk2-stable202402, then it should be applied there as well.
>

The cherry-pick has no conflict so I'll put that in my review branch.

Thanks!