| Message ID | 20200908072939.30178-4-lersek@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | edk2: adopt the edk2-stable202008 release | expand |
On 9/8/20 9:29 AM, Laszlo Ersek wrote: > Ekd2 commit 07952a962a40 ("OvmfPkg: rename TPM2 config prefix to TPM", > 2020-03-04), part of edk2-stable202005, renamed OVMF's TPM2*_ENABLE build > flags to TPM*_ENABLE. Going forward, the TPM*_ENABLE flags would activate > both TPM1.2 and TPM2.0 support. > > In order to build OVMF at edk2-stable202008 without losing currently > enabled functionality, insert the new flags as no-ops now. We'll remove > the old flags after advancing with the edk2 submodule. > > Cc: Philippe Mathieu-Daudé <philmd@redhat.com> > Ref: https://bugs.launchpad.net/qemu/+bug/1852196 > Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > roms/Makefile.edk2 | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 > index 33a074d3a4c2..7c06645c95ca 100644 > --- a/roms/Makefile.edk2 > +++ b/roms/Makefile.edk2 > @@ -88,6 +88,8 @@ 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 TPM2_CONFIG_ENABLE > cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ > @@ -100,6 +102,8 @@ 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 TPM2_CONFIG_ENABLE \ > -D SECURE_BOOT_ENABLE \ > @@ -114,6 +118,8 @@ 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 TPM2_CONFIG_ENABLE > cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ > @@ -127,6 +133,8 @@ 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 TPM2_CONFIG_ENABLE \ > -D SECURE_BOOT_ENABLE \ >
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 33a074d3a4c2..7c06645c95ca 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -88,6 +88,8 @@ 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 TPM2_CONFIG_ENABLE cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -100,6 +102,8 @@ 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 TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ @@ -114,6 +118,8 @@ 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 TPM2_CONFIG_ENABLE cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ @@ -127,6 +133,8 @@ 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 TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \
Ekd2 commit 07952a962a40 ("OvmfPkg: rename TPM2 config prefix to TPM", 2020-03-04), part of edk2-stable202005, renamed OVMF's TPM2*_ENABLE build flags to TPM*_ENABLE. Going forward, the TPM*_ENABLE flags would activate both TPM1.2 and TPM2.0 support. In order to build OVMF at edk2-stable202008 without losing currently enabled functionality, insert the new flags as no-ops now. We'll remove the old flags after advancing with the edk2 submodule. Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Ref: https://bugs.launchpad.net/qemu/+bug/1852196 Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- roms/Makefile.edk2 | 8 ++++++++ 1 file changed, 8 insertions(+)