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 <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jianyong Wu <jianyong.wu@arm.com>
Cc: Anatol Belski <anbelski@linux.microsoft.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Chao Li <lichao@loongson.cn>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Aleksandr Goncharov <chat@joursoir.net>
This commit is contained in:
Aleksandr Goncharov 2024-09-05 22:51:01 +03:00 committed by mergify[bot]
parent 1db5895c39
commit 7ccda1a0b3
7 changed files with 7 additions and 39 deletions

View File

@ -635,11 +635,7 @@
!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

View File

@ -414,13 +414,7 @@
# PCD and PcdPciDisableBusEnumeration above have not been assigned yet # PCD and PcdPciDisableBusEnumeration above have not been assigned yet
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress |0xFFFFFFFFFFFFFFFF gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress |0xFFFFFFFFFFFFFFFF
# !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
#
!if $(NETWORK_ENABLE) == TRUE
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport | 0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport | 0x01
!endif
# #
# SMBIOS entry point version # SMBIOS entry point version

View File

@ -650,11 +650,7 @@
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

View File

@ -659,11 +659,7 @@
!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

View File

@ -676,11 +676,7 @@
gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000
[PcdsDynamicDefault.X64] [PcdsDynamicDefault.X64]
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
[PcdsDynamicHii] [PcdsDynamicHii]
!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc

View File

@ -690,11 +690,7 @@
!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc !include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
# IPv4 and IPv6 PXE Boot support.
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
# Set ConfidentialComputing defaults # Set ConfidentialComputing defaults
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

View File

@ -217,13 +217,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
!if $(NETWORK_ENABLE) == TRUE !include NetworkPkg/NetworkDynamicPcds.dsc.inc
#
# IPv4 and IPv6 PXE Boot support.
#
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
# #
# TPM2 support # TPM2 support