Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OVMF fix building without network support #6061

Merged
merged 7 commits into from
Nov 11, 2024
Merged

OVMF fix building without network support #6061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15c5b21
NetworkPkg: introduce include file for dynamic PCDs
Joursoir Sep 5, 2024
159996c
OvmfPkg: use NetworkDynamicPcds include file
Joursoir Sep 5, 2024
fac2482
ArmVirtPkg: use NetworkDynamicPcds include file
Joursoir Sep 5, 2024
eba4547
NetworkPkg: mark fixed network PCDs
Joursoir Sep 20, 2024
bbdfbb9
OvmfPkg: mark fixed network PCDs
Joursoir Sep 20, 2024
2530c1f
ArmVirtPkg: mark fixed network PCDs
Joursoir Sep 20, 2024
b51f98b
Merge branch 'master' into ovmf-fix-network-disable
mergify[bot] Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ArmVirtPkg/ArmVirtQemu.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

# System Memory Base -- fixed at 0x4000_0000
gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000
Expand Down Expand Up @@ -297,13 +297,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE

!if $(NETWORK_ENABLE) == TRUE
#
# IPv4 and IPv6 PXE Boot support.
#
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
!include NetworkPkg/NetworkDynamicPcds.dsc.inc

#
# TPM2 support
Expand Down
10 changes: 2 additions & 8 deletions ArmVirtPkg/ArmVirtQemuKernel.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
Expand Down Expand Up @@ -260,13 +260,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE

!if $(NETWORK_ENABLE) == TRUE
#
# IPv4 and IPv6 PXE Boot support.
#
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
!include NetworkPkg/NetworkDynamicPcds.dsc.inc

################################################################################
#
Expand Down
5 changes: 4 additions & 1 deletion NetworkPkg/Network.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
!endif

[PcdsFixedAtBuild]
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

[PcdsDynamicDefault]
!include NetworkPkg/NetworkDynamicPcds.dsc.inc

[LibraryClasses]
!include NetworkPkg/NetworkLibs.dsc.inc
Expand Down
20 changes: 20 additions & 0 deletions NetworkPkg/NetworkDynamicPcds.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## @file
# Network DSC include file for [PcdsDynamic*] section of all Architectures.
#
# This file can be included to the [PcdsDynamic*] section(s) of a platform DSC file
# by using "!include NetworkPkg/NetworkDynamicPcds.dsc.inc" to specify PCD settings
# according to the value of flags described in "NetworkDefines.dsc.inc".
#
# Copyright (c) 2024, Aleksandr Goncharov. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##

#
# IPv4 and IPv6 PXE Boot support.
#
!if $(NETWORK_ENABLE) == TRUE
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
!endif
6 changes: 3 additions & 3 deletions NetworkPkg/NetworkPcds.dsc.inc → NetworkPkg/NetworkFixedPcds.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## @file
# Network DSC include file for [Pcds*] section of all Architectures.
# Network DSC include file for [PcdsFixed*] section of all Architectures.
#
# This file can be included to the [Pcds*] section(s) of a platform DSC file
# by using "!include NetworkPkg/NetworkPcds.dsc.inc" to specify PCD settings
# This file can be included to the [PcdsFixed*] section(s) of a platform DSC file
# by using "!include NetworkPkg/NetworkFixedPcds.dsc.inc" to specify PCD settings
# according to the value of flags described in "NetworkDefines.dsc.inc".
#
# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
Expand Down
2 changes: 1 addition & 1 deletion OvmfPkg/Bhyve/BhyveX64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

# Point to the MdeModulePkg/Application/UiApp/UiApp.inf
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
Expand Down
8 changes: 2 additions & 6 deletions OvmfPkg/CloudHv/CloudHvX64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

Expand Down Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize | 0x40000
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize | 0x40000
Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions OvmfPkg/Microvm/MicrovmX64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions OvmfPkg/OvmfPkgIa32.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions OvmfPkg/OvmfPkgIa32X64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions OvmfPkg/OvmfPkgX64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion OvmfPkg/OvmfXen.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
#
# Network Pcds
#
!include NetworkPkg/NetworkPcds.dsc.inc
!include NetworkPkg/NetworkFixedPcds.dsc.inc

!ifdef $(DEBUG_ON_HYPERVISOR_CONSOLE)
## Set Xen's debug IO port for PlatformDebugLibIoPort
Expand Down
8 changes: 1 addition & 7 deletions OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading