From: Stefan Berger <stefanb@linux.ibm.com>
To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, gerd@kraxel.org
Cc: marcandre.lureau@redhat.com, Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH] edk2: Use TPM2_ENABLE and TPM2_CONFIG_ENABLE for newer edk2
Date: Wed, 8 Jun 2022 07:33:11 -0400 [thread overview]
Message-ID: <20220608113311.2144610-1-stefanb@linux.ibm.com> (raw)
Recent changes to edk2 switched the x86_64 build from using TPM_ENABLE
to TPM2_ENABLE and TPM1_ENABLE to be similar to the ARM build. Adapt
the QEMU edk2 Makefile to build with TPM2_ENABLE. QEMU v7.0.0 had lost
the TPM 2 support in edk2 and this restores it.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
roms/Makefile.edk2 | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 485f2244b1..a6eb14f215 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -101,8 +101,7 @@ submodules:
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE
+ -D TPM2_ENABLE
cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
../pc-bios/edk2-i386-secure-code.fd: submodules
@@ -113,8 +112,7 @@ 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 SECURE_BOOT_ENABLE \
-D SMM_REQUIRE
cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
@@ -127,8 +125,7 @@ submodules:
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE
+ -D TPM2_ENABLE
cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
../pc-bios/edk2-x86_64-secure-code.fd: submodules
@@ -140,8 +137,7 @@ 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 SECURE_BOOT_ENABLE \
-D SMM_REQUIRE
cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
--
2.35.3
next reply other threads:[~2022-06-08 11:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 11:33 Stefan Berger [this message]
2022-06-08 13:55 ` [PATCH] edk2: Use TPM2_ENABLE and TPM2_CONFIG_ENABLE for newer edk2 Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220608113311.2144610-1-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=gerd@kraxel.org \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).