roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros

At tag "edk2-stable202008", the TPM2_ENABLE and TPM2_CONFIG_ENABLE macros
are useless (for IA32 and X64). Their roles have been absorbed by
TPM_ENABLE and TPM_CONFIG_ENABLE, respectively. Remove the old build
flags.

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

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 7c06645c95ca9f9371c1932fa831a6231b478d73..8cdf337fc1e9e0b7bae4828cc2c0b277d2d15074 100644 (file)
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -89,9 +89,7 @@ submodules:
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
                -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE \
-               -D TPM2_ENABLE \
-               -D TPM2_CONFIG_ENABLE
+               -D TPM_CONFIG_ENABLE
        cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-i386-secure-code.fd: submodules
@@ -104,8 +102,6 @@ submodules:
                -D NETWORK_TLS_ENABLE \
                -D TPM_ENABLE \
                -D TPM_CONFIG_ENABLE \
-               -D TPM2_ENABLE \
-               -D TPM2_CONFIG_ENABLE \
                -D SECURE_BOOT_ENABLE \
                -D SMM_REQUIRE
        cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
@@ -119,9 +115,7 @@ submodules:
                -D NETWORK_HTTP_BOOT_ENABLE \
                -D NETWORK_TLS_ENABLE \
                -D TPM_ENABLE \
-               -D TPM_CONFIG_ENABLE \
-               -D TPM2_ENABLE \
-               -D TPM2_CONFIG_ENABLE
+               -D TPM_CONFIG_ENABLE
        cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
 
 ../pc-bios/edk2-x86_64-secure-code.fd: submodules
@@ -135,8 +129,6 @@ submodules:
                -D NETWORK_TLS_ENABLE \
                -D TPM_ENABLE \
                -D TPM_CONFIG_ENABLE \
-               -D TPM2_ENABLE \
-               -D TPM2_CONFIG_ENABLE \
                -D SECURE_BOOT_ENABLE \
                -D SMM_REQUIRE
        cp edk2/Build/Ovmf3264/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@