Merge remote-tracking branch 'remotes/konstantin/tags/qga-win32-pull-2022-01-10'...

[mirror_qemu.git] / roms / Makefile.edk2

diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 8cdf337fc1e9e0b7bae4828cc2c0b277d2d15074..fdae0b511f5970dbce8e4a0078da1d8af78b3c31 100644 (file)
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -51,7 +51,12 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
 # make-release/tarball scripts.
 submodules:
        if test -d edk2/.git; then \
-               cd edk2 && git submodule update --init --force; \
+               cd edk2 && git submodule update --init --force -- \
+                       ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
+                       BaseTools/Source/C/BrotliCompress/brotli \
+                       CryptoPkg/Library/OpensslLib/openssl \
+                       MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
+               ; \
        fi
 
 # See notes on the ".NOTPARALLEL" target and the "+" indicator in
@@ -64,7 +69,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 +83,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 $@