Skip to contentSkip to conversation

ovmf: fix tpm PACKAGECONFIG to use TPM2_ENABLE

PATCH New Eilís 'pidge' Ní Fhlannagáin 1 participant 1 message Jul 8

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ovmf/ovmf_git.bb +1 -1
index 19bcc4a96f..01f840c215 100644
@@ -14,7 +14,7 @@ PACKAGECONFIG += "${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'tpm', '', d)}
 PACKAGECONFIG += "${@bb.utils.contains('MACHINE_FEATURES', '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,,"
 
 # GCC12 trips on it
 #see https://src.fedoraproject.org/rpms/edk2/blob/rawhide/f/0032-Basetools-turn-off-gcc12-warning.patch
Signature · 1 line
2.43.0