[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros |
Date: |
Mon, 14 Sep 2020 09:17:16 +0200 |
From: Laszlo Ersek <lersek@redhat.com>
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>
---
roms/Makefile.edk2 | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 7c06645c95c..8cdf337fc1e 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 $@
--
2.26.2
- [PULL 00/10] EDK2 firmware: Adopt the edk2-stable202008 release, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 01/10] Makefile: remove obsolete edk2 exception from "clean" rule, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 02/10] roms/efirom, tests/uefi-test-tools: update edk2's own submodules first, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 03/10] roms/Makefile.edk2: prepare for replacing TPM2*_ENABLE macros, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 04/10] tests: acpi: tolerate "virt/SSDT.memhp" mismatch temporarily, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros,
Philippe Mathieu-Daudé <=
- [PULL 05/10] roms/edk2: update submodule from edk2-stable201905 to edk2-stable202008, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 07/10] roms/Makefile.edk2: enable new ARM/AARCH64 flags up to edk2-stable202008, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 09/10] pc-bios: update the README file with edk2-stable202008 information, Philippe Mathieu-Daudé, 2020/09/14
- [PULL 10/10] tests: acpi: update "virt/SSDT.memhp" for edk2-stable202008, Philippe Mathieu-Daudé, 2020/09/14
- Re: [PULL 00/10] EDK2 firmware: Adopt the edk2-stable202008 release, Peter Maydell, 2020/09/14
- [PULL 08/10] pc-bios: refresh edk2 build artifacts for edk2-stable202008, Philippe Mathieu-Daudé, 2020/09/14