Fix a regression that was introduced with the edk2 202202 upgrade (commit e2f3137c7344).
Upstream changed TPM_ENABLE to TPM1_ENABLE and TPM2_ENABLE. This led to TPM 2.0 (which is needed for windows 11) silently got disabled. Ref: https://github.com/tianocore/edk2/commit/4de8d61bcec02a13ceed84f92b0cf3ea58adf9c5 Signed-off-by: Natanael Copa <nc...@alpinelinux.org> --- I have not really been able to test this, due to issues with building the OVMF_CODE.fd from the qemu source tree. I do have tested building OVMF_CODE.fd for the Alpine Linux package, and adding -D TPM2_ENABLE dis solve the issue in windows guests. So I believe it is fine. I don't think an explicit -D TPM1_ENABLE is needed as I believe it is the default. https://github.com/tianocore/edk2/blob/8fc06b6e19e3df93cc989b4f85877d8a7783e5bf/OvmfPkg/OvmfTpmDefines.dsc.inc#L8 The -D TPM_CONFIG_ENABLE can probably be removed. It was not found anywhere when grepping the sources. roms/Makefile.edk2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 485f2244b1..eb47f008c6 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -101,7 +101,7 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TPM_ENABLE \ + -D TPM2_ENABLE \ -D TPM_CONFIG_ENABLE cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -113,7 +113,7 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TPM_ENABLE \ + -D TPM2_ENABLE \ -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE @@ -127,7 +127,7 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TPM_ENABLE \ + -D TPM2_ENABLE \ -D TPM_CONFIG_ENABLE cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ @@ -140,7 +140,7 @@ submodules: -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TPM_ENABLE \ + -D TPM2_ENABLE \ -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE -- 2.38.0