From 087a47688c3b31cfc75daccafc9755b1995cecf5 Mon Sep 17 00:00:00 2001 From: Alexander Gryanko Date: Mon, 25 Nov 2024 01:04:29 +0300 Subject: [PATCH] OvmfPkg: PXE boot option build flag The second step is to add an option to the OvmfPkg module to disable PXE booting using the NETWORK_PXE_BOOT_ENABLE flag. The patch is divided into 3 parts. At the current stage the flag is not functional. Signed-off-by: Alexander Gryanko --- OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc | 10 ++++++---- OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc | 3 +++ OvmfPkg/Microvm/MicrovmX64.dsc | 1 + OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 3 +++ 8 files changed, 17 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 38137d8c13..3ec4faa74a 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -43,6 +43,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = TRUE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc diff --git a/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc index 713eec7dd1..42455c2d48 100644 --- a/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc +++ b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc @@ -3,10 +3,12 @@ ## !if $(NETWORK_ENABLE) == TRUE - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { - - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf - } + !if $(NETWORK_PXE_BOOT_ENABLE) == TRUE + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { + + NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf + } + !endif !if $(NETWORK_TLS_ENABLE) == TRUE NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { diff --git a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc index e49bbf387a..128fdd9d7e 100644 --- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc +++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc @@ -43,6 +43,7 @@ DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = FALSE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc ############################################################################ @@ -545,10 +546,12 @@ # !include NetworkPkg/NetworkComponents.dsc.inc +!if $(NETWORK_PXE_BOOT_ENABLE) == TRUE NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf } +!endif !if $(NETWORK_TLS_ENABLE) == TRUE NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index bc9be1c5c2..81af41ef6f 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -46,6 +46,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = TRUE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 7ab6af3a69..8b8d5124ec 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -49,6 +49,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = TRUE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index e7fff78df9..68b0d4b2ea 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -49,6 +49,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = TRUE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 556984bdaa..846444b949 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -49,6 +49,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = TRUE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !include NetworkPkg/NetworkDefines.dsc.inc diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc index 0904f3b4a5..588a617ad9 100644 --- a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc +++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc @@ -45,6 +45,7 @@ DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE DEFINE NETWORK_ISCSI_ENABLE = FALSE + DEFINE NETWORK_PXE_BOOT_ENABLE = TRUE !if $(NETWORK_SNP_ENABLE) == TRUE !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only" @@ -387,10 +388,12 @@ NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf } +!if $(NETWORK_PXE_BOOT_ENABLE) == TRUE NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf } +!endif !if $(NETWORK_TLS_ENABLE) == TRUE NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {