diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2020-09-07 22:03:36 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-09-13 23:03:15 +0200 |
| commit | 504fffb9e5260c5bcb8a0f258adee7c1a2bf4746 (patch) | |
| tree | 8a79bc374927a2da1601cf978c6100d9c642bfc5 | |
| parent | ec87b5daca761039bbcf781eedbe4987f790836f (diff) | |
| download | focaccia-qemu-504fffb9e5260c5bcb8a0f258adee7c1a2bf4746.tar.gz focaccia-qemu-504fffb9e5260c5bcb8a0f258adee7c1a2bf4746.zip | |
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>
| -rw-r--r-- | roms/Makefile.edk2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 33a074d3a4..7c06645c95 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 \ |