Commit 36bf711d authored by Laszlo Ersek's avatar Laszlo Ersek
Browse files

roms/Makefile.edk2: remove edk2-stable201903 network feature test macros 

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 <philmd@redhat.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1831477


Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daud <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daud <philmd@redhat.com>
parent 6b364d2a

roms/Makefile.edk2

+2 −12
Original line number Diff line number Diff line
@@ -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 \