aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2020-09-08 00:34:12 +0200
committerPhilippe Mathieu-Daudé <philmd@redhat.com>2020-09-13 23:03:15 +0200
commit374680acf344ec11ba0a009568078d330e501ad2 (patch)
treecc81c96daf3b06afc75c91ef465b10637a5d1c74
parente105de7579e3c258e4792b30b4ff0990c238ef93 (diff)
downloadqemu-arm-374680acf344ec11ba0a009568078d330e501ad2.tar.gz
roms/Makefile.edk2: enable new ARM/AARCH64 flags up to edk2-stable202008
Edk2 commit ffe048a0807b ("ArmVirtPkg: handle NETWORK_TLS_ENABLE in ArmVirtQemu*", 2019-06-28), part of edk2-stable201908, allows us to include the UEFI HTTPS Boot feature in the ArmVirtQemu fw platform (ARM and AARCH64). Edk2 commit range 4c0f6e349d32..0980779a9ddc, part of edk2-stable202005, added TPM2 support to ArmVirtQemu; enable it as well. (Unlike with OVMF IA32 and X64, TPM-1.2 support is not included, hence the TPM2-specific flag names.) 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-8-lersek@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--roms/Makefile.edk210
1 files changed, 8 insertions, 2 deletions
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 8cdf337fc1..a8ed325575 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -64,7 +64,10 @@ submodules:
--arch=AARCH64 \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE
+ -D NETWORK_HTTP_BOOT_ENABLE \
+ -D NETWORK_TLS_ENABLE \
+ -D TPM2_ENABLE \
+ -D TPM2_CONFIG_ENABLE
cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \
$@
truncate --size=64M $@
@@ -75,7 +78,10 @@ submodules:
--arch=ARM \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE
+ -D NETWORK_HTTP_BOOT_ENABLE \
+ -D NETWORK_TLS_ENABLE \
+ -D TPM2_ENABLE \
+ -D TPM2_CONFIG_ENABLE
cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \
$@
truncate --size=64M $@