On 9/8/20 9:29 AM, Laszlo Ersek wrote:
> 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>
> ---
> roms/Makefile.edk2 | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
> index 8cdf337fc1e9..a8ed3255757f 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 $@
>