Skip to contentSkip to conversation

edk2: Use TPM2_ENABLE and TPM2_CONFIG_ENABLE for newer edk2

PATCH Superseded Stefan Berger 2 participants 2 messages Jun 8, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 edk2: Use TPM2_ENABLE and TPM2_CONFIG_ENABLE for newer edk2

Recent changes to edk2 switched the x86_64 build from using TPM_ENABLE to TPM2_ENABLE and TPM1_ENABLE to be similar to the ARM build. Adapt the QEMU edk2 Makefile to build with TPM2_ENABLE. QEMU v7.0.0 had lost the TPM 2 support in edk2 and this restores it.

---
 roms/Makefile.edk2 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
roms/Makefile.edk2 +4 -8
index 485f2244b1..a6eb14f215 100644
@@ -101,8 +101,7 @@ submodules:
 		-D NETWORK_IP6_ENABLE \
 		-D NETWORK_HTTP_BOOT_ENABLE \
 		-D NETWORK_TLS_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM_CONFIG_ENABLE
+		-D TPM2_ENABLE
 	cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-i386-secure-code.fd: submodules
@@ -113,8 +112,7 @@ submodules:
 		-D NETWORK_IP6_ENABLE \
 		-D NETWORK_HTTP_BOOT_ENABLE \
 		-D NETWORK_TLS_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM_CONFIG_ENABLE \
+		-D TPM2_ENABLE \
 		-D SECURE_BOOT_ENABLE \
 		-D SMM_REQUIRE
 	cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
@@ -127,8 +125,7 @@ submodules:
 		-D NETWORK_IP6_ENABLE \
 		-D NETWORK_HTTP_BOOT_ENABLE \
 		-D NETWORK_TLS_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM_CONFIG_ENABLE
+		-D TPM2_ENABLE
 	cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-x86_64-secure-code.fd: submodules
@@ -140,8 +137,7 @@ submodules:
 		-D NETWORK_IP6_ENABLE \
 		-D NETWORK_HTTP_BOOT_ENABLE \
 		-D NETWORK_TLS_ENABLE \
-		-D TPM_ENABLE \
-		-D TPM_CONFIG_ENABLE \
+		-D TPM2_ENABLE \
 		-D SECURE_BOOT_ENABLE \
 		-D SMM_REQUIRE
 	cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw

Hi

Quoted 2 lines · Stefan Berger

Recent changes to edk2 switched the x86_64 build from using TPM_ENABLE

You can quote the relevant change: commit 4de8d61bcec ("OvmfPkg:
rework TPM configuration")

Quoted 5 lines

to TPM2_ENABLE and TPM1_ENABLE to be similar to the ARM build. Adapt the QEMU edk2 Makefile to build with TPM2_ENABLE. QEMU v7.0.0 had lost the TPM 2 support in edk2 and this restores it.

Quoted 51 lines
---
 roms/Makefile.edk2 | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
roms/Makefile.edk2 +4 -9
index 485f2244b1..a6eb14f215 100644
@@ -101,8 +101,7 @@ submodules:
                -D NETWORK_IP6_ENABLE \
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
-               -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE
+               -D TPM2_ENABLE
        cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-i386-secure-code.fd: submodules
@@ -113,8 +112,7 @@ submodules:
                -D NETWORK_IP6_ENABLE \
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
-               -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE \
+               -D TPM2_ENABLE \
                -D SECURE_BOOT_ENABLE \
                -D SMM_REQUIRE
        cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
@@ -127,8 +125,7 @@ submodules:
                -D NETWORK_IP6_ENABLE \
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
-               -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE
+               -D TPM2_ENABLE
        cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-x86_64-secure-code.fd: submodules
@@ -140,8 +137,7 @@ submodules:
                -D NETWORK_IP6_ENABLE \
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
-               -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE \
+               -D TPM2_ENABLE \
                -D SECURE_BOOT_ENABLE \
                -D SMM_REQUIRE
        cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
--

2.35.3