From 7ccda1a0b362a8b4700a7f4f68b0b3945cb8658c Mon Sep 17 00:00:00 2001 From: Aleksandr Goncharov Date: Thu, 5 Sep 2024 22:51:01 +0300 Subject: OvmfPkg: use NetworkDynamicPcds include file Start using the include file in the OvmfPkg package to manage dynamic network-related PCDs. This change removes the manual addition of `PcdIPv4PXESupport` and `PcdIPv6PXESupport` from the DSC file, relying instead on the centralized include file introduced in NetworkPkg. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Jianyong Wu Cc: Anatol Belski Cc: Sunil V L Cc: Andrei Warkentin Cc: Chao Li Cc: Bibo Mao Cc: Xianglai Li Signed-off-by: Aleksandr Goncharov --- OvmfPkg/CloudHv/CloudHvX64.dsc | 6 +----- OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc | 8 +------- OvmfPkg/Microvm/MicrovmX64.dsc | 6 +----- OvmfPkg/OvmfPkgIa32.dsc | 6 +----- OvmfPkg/OvmfPkgIa32X64.dsc | 6 +----- OvmfPkg/OvmfPkgX64.dsc | 6 +----- OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 8 +------- 7 files changed, 7 insertions(+), 39 deletions(-) (limited to 'OvmfPkg') diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 1a8d3c4911..1e425e9ab8 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -635,11 +635,7 @@ !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc -!if $(NETWORK_ENABLE) == TRUE - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 diff --git a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc index 755892737b..ba319c9956 100644 --- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc +++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc @@ -414,13 +414,7 @@ # PCD and PcdPciDisableBusEnumeration above have not been assigned yet gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress |0xFFFFFFFFFFFFFFFF - # - # IPv4 and IPv6 PXE Boot support. - # -!if $(NETWORK_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport | 0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport | 0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # # SMBIOS entry point version diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 6fe8dfd288..36e8890574 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -650,11 +650,7 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!if $(NETWORK_ENABLE) == TRUE - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 34f7b9958b..2001a4f706 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -659,11 +659,7 @@ !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc -!if $(NETWORK_ENABLE) == TRUE - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index ef04ae21a7..a3ff9c720f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -676,11 +676,7 @@ gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 [PcdsDynamicDefault.X64] -!if $(NETWORK_ENABLE) == TRUE - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc [PcdsDynamicHii] !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index e7fc7a9410..9981e94f50 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -690,11 +690,7 @@ !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc -!if $(NETWORK_ENABLE) == TRUE - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc index 63d896587b..0904f3b4a5 100644 --- a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc +++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc @@ -217,13 +217,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 -!if $(NETWORK_ENABLE) == TRUE - # - # IPv4 and IPv6 PXE Boot support. - # - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 -!endif +!include NetworkPkg/NetworkDynamicPcds.dsc.inc # # TPM2 support -- cgit v1.2.3