roms/Makefile.edk2: prepare for replacing TPM2*_ENABLE macros

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>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908072939.30178-4-lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 33a074d3a4c21b5460d98bbc7d4a64cf492fd059..7c06645c95ca9f9371c1932fa831a6231b478d73 100644 (file)
--- 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 \