aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2020-09-08 00:24:31 +0200
committerPhilippe Mathieu-Daudé <philmd@redhat.com>2020-09-13 23:03:15 +0200
commite105de7579e3c258e4792b30b4ff0990c238ef93 (patch)
treec844e5db9a0790d44a50b7ac705e17746e6249a8
parent0e2db2c66380b2f124954b80463676f0659d9bff (diff)
downloadqemu-arm-e105de7579e3c258e4792b30b4ff0990c238ef93.tar.gz
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>
-rw-r--r--roms/Makefile.edk212
1 files changed, 2 insertions, 10 deletions
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 7c06645c95..8cdf337fc1 100644
--- 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 $@