Message ID | 20220608113311.2144610-1-stefanb@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | edk2: Use TPM2_ENABLE and TPM2_CONFIG_ENABLE for newer edk2 | expand |
Hi On Wed, Jun 8, 2022 at 3:33 PM Stefan Berger <stefanb@linux.ibm.com> wrote: > > 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") > 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. > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > roms/Makefile.edk2 | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 > index 485f2244b1..a6eb14f215 100644 > --- a/roms/Makefile.edk2 > +++ b/roms/Makefile.edk2 > @@ -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 >
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 485f2244b1..a6eb14f215 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -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 $@
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. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- roms/Makefile.edk2 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)