diff options
| author | Aleksandr Goncharov <chat@joursoir.net> | 2024-09-05 22:51:01 +0300 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-11-11 13:38:51 +0000 |
| commit | 7ccda1a0b362a8b4700a7f4f68b0b3945cb8658c (patch) | |
| tree | 333bf30a47a43bc21369002ef38ade304ca8469f /OvmfPkg | |
| parent | 1db5895c3991bb2e810a0383bba5c4c31f36eba4 (diff) | |
| download | edk2-7ccda1a0b362a8b4700a7f4f68b0b3945cb8658c.tar.gz edk2-7ccda1a0b362a8b4700a7f4f68b0b3945cb8658c.tar.bz2 edk2-7ccda1a0b362a8b4700a7f4f68b0b3945cb8658c.zip | |
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>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/CloudHv/CloudHvX64.dsc | 6 | ||||
| -rw-r--r-- | OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc | 8 | ||||
| -rw-r--r-- | OvmfPkg/Microvm/MicrovmX64.dsc | 6 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32.dsc | 6 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.dsc | 6 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgX64.dsc | 6 | ||||
| -rw-r--r-- | OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 8 |
7 files changed, 7 insertions, 39 deletions
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
|