At tag "edk2-stable201905", the build flags HTTP_BOOT_ENABLE and TLS_ENABLE have become useless. Their roles have been taken by NETWORK_HTTP_BOOT_ENABLE and NETWORK_TLS_ENABLE, respectively. Remove the old build flags.
Cc: Philippe Mathieu-Daudé <phi...@redhat.com> Ref: https://bugs.launchpad.net/qemu/+bug/1831477 Signed-off-by: Laszlo Ersek <ler...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- roms/Makefile.edk2 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 071d6e454b68..6a19498d0738 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -57,8 +57,7 @@ submodules: --arch=AARCH64 \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ - -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE + -D NETWORK_HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \ $@ truncate --size=64M $@ @@ -69,8 +68,7 @@ submodules: --arch=ARM \ --platform=ArmVirtPkg/ArmVirtQemu.dsc \ -D NETWORK_IP6_ENABLE \ - -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE + -D NETWORK_HTTP_BOOT_ENABLE cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \ $@ truncate --size=64M $@ @@ -82,9 +80,7 @@ submodules: --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ @@ -96,9 +92,7 @@ submodules: --platform=OvmfPkg/OvmfPkgIa32.dsc \ -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ @@ -112,9 +106,7 @@ submodules: --platform=OvmfPkg/OvmfPkgX64.dsc \ -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ @@ -127,9 +119,7 @@ submodules: --platform=OvmfPkg/OvmfPkgIa32X64.dsc \ -D NETWORK_IP6_ENABLE \ -D NETWORK_HTTP_BOOT_ENABLE \ - -D HTTP_BOOT_ENABLE \ -D NETWORK_TLS_ENABLE \ - -D TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -- 2.19.1.3.g30247aa5d201
