[edk2-devel] [PATCH 1/4] OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
Zhang, Shenglei
shenglei.zhang at intel.com
Wed May 15 07:02:04 UTC 2019
Hi Laszlo:
> -----Original Message-----
> From: devel at edk2.groups.io [mailto:devel at edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Tuesday, May 14, 2019 9:49 PM
> To: devel at edk2.groups.io; Zhang, Shenglei <shenglei.zhang at intel.com>
> Cc: Justen, Jordan L <jordan.l.justen at intel.com>; Ard Biesheuvel
> <ard.biesheuvel at linaro.org>; Anthony Perard <anthony.perard at citrix.com>;
> Julien Grall <julien.grall at linaro.org>
> Subject: Re: [edk2-devel] [PATCH 1/4] OvmfPkg: Update DSC/FDF to use
> NetworkPkg's include fragment file.
>
> On 05/14/19 09:39, Zhang, Shenglei wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> > The feature enabling flags in [Defines] section have been updated to use
> > the NetworkPkg's terms, and the value has been overridden with the
> original
> > default value on this platform.
> >
> > This patch also rename the TLS_ENABLE flag to PLATFORM_TLS_ENABLE for
> the
> > platform specific configuration for TLS support.
>
> Originally I thought that would be the right approach. However, Liming
> explained that we don't need "PLATFORM_TLS_ENABLE", because the
> platform
> DSC can override [Components] entries that are included from
> "NetworkComponents.dsc.inc".
>
> Please see:
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1449
> http://mid.mail-
> archive.com/4A89E2EF3DFEDB4C8BFDE51014F606A14E443D46 at SHSMSX104.c
> cr.corp.intel.com
>
> ... Oh wait, this patch doesn't actually introduce PLATFORM_TLS_ENABLE!
> The patch could be correct in fact (I'll review it just below); however,
> the commit message is incorrect.
>
> (1) Please remove the PLATFORM_TLS_ENABLE paragraph from the commit
> message.
>
>
> > Cc: Jordan Justen <jordan.l.justen at intel.com>
> > Cc: Laszlo Ersek <lersek at redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
> > Cc: Anthony Perard <anthony.perard at citrix.com>
> > Cc: Julien Grall <julien.grall at linaro.org>
> > Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
> > ---
> > OvmfPkg/OvmfPkgIa32.dsc | 70 +++++++++++--------------------------
> > OvmfPkg/OvmfPkgIa32.fdf | 29 +---------------
> > OvmfPkg/OvmfPkgIa32X64.dsc | 71 +++++++++++---------------------------
> > OvmfPkg/OvmfPkgIa32X64.fdf | 29 +---------------
> > OvmfPkg/OvmfPkgX64.dsc | 69 +++++++++++-------------------------
> > OvmfPkg/OvmfPkgX64.fdf | 29 +---------------
> > 6 files changed, 65 insertions(+), 232 deletions(-)
> >
> > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> > index 36a0f87258..0977233b8b 100644
> > --- a/OvmfPkg/OvmfPkgIa32.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32.dsc
> > @@ -29,14 +29,17 @@
> > # -D FLAG=VALUE
> > #
> > DEFINE SECURE_BOOT_ENABLE = FALSE
> > - DEFINE NETWORK_IP6_ENABLE = FALSE
> > - DEFINE HTTP_BOOT_ENABLE = FALSE
> > DEFINE SMM_REQUIRE = FALSE
> > - DEFINE TLS_ENABLE = FALSE
> > DEFINE TPM2_ENABLE = FALSE
> > DEFINE TPM2_CONFIG_ENABLE = FALSE
> > DEFINE USE_LEGACY_ISA_STACK = FALSE
> >
> > + DEFINE NETWORK_TLS_ENABLE = FALSE
> > + DEFINE NETWORK_IP6_ENABLE = FALSE
> > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> > +
>
> (2) You forgot:
>
> DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
>
>
> > +!include NetworkPkg/NetworkDefines.dsc.inc
> > +
> > #
> > # Flash size selection. Setting FD_SIZE_IN_KB on the command line
> directly to
> > # one of the supported values, in place of any of the convenience macros,
> is
> > @@ -139,10 +142,6 @@
>
> (3) Please update your git configuration so that the diff hunk headers
> (@@) show what section you are modifying, in the INF, DSC, DEC, and FDF
> files:
>
> (3a) run the command
>
> $ git config diff.ini.xfuncname '^\[[A-Za-z0-9_., ]+]'
>
> from
> <https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-
> git-guide-for-edk2-contributors-and-maintainers#contrib-05>.
>
> (3b) implement the settings from
> <https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-
> git-guide-for-edk2-contributors-and-maintainers#contrib-09>.
>
>
> > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> > UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> >
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
> > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> >
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> > QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
>
> Unfortunately, the OVMF DSC files have a small wart that should be fixed
> up, before this patch.
>
> Namely, the above library class resolutions are duplicated between
> [LibraryClasses], and [LibraryClasses.common.DXE_DRIVER].
>
> (4) Therefore, please *prepend* a patch to this series that eliminates
> the [LibraryClasses.common.DXE_DRIVER] resolutions altogether, at first.
Thanks for your comments!
I'll send a patch first to solve the duplicated library classes about network in
[LibraryClasses.common.DXE_DRIVER] section.
>
>
> (5) You forgot to remove:
>
> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
>
>
> > @@ -168,7 +167,7 @@
> >
> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas
> eDebugPrintErrorLevelLib.inf
> >
> > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> > -!if $(TLS_ENABLE) == TRUE
> > +!if $(NETWORK_TLS_ENABLE) == TRUE
> > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > !else
> > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> > @@ -186,11 +185,12 @@
> >
> > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> >
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> > -!endif
> > + #
> > + # Network libraries
> > + #
> > +!include NetworkPkg/NetworkLibs.dsc.inc
> >
> > -!if $(TLS_ENABLE) == TRUE
> > +!if $(NETWORK_TLS_ENABLE) == TRUE
> > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> > !endif
> >
> > @@ -438,7 +438,7 @@
> > !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)
> > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
> > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800
> > -!if $(TLS_ENABLE) == FALSE
> > +!if $(NETWORK_TLS_ENABLE) == FALSE
> > # match PcdFlashNvStorageVariableSize purely for convenience
> > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000
> > !endif
> > @@ -446,12 +446,12 @@
> > !if $(FD_SIZE_IN_KB) == 4096
> > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400
> > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400
> > -!if $(TLS_ENABLE) == FALSE
> > +!if $(NETWORK_TLS_ENABLE) == FALSE
> > # match PcdFlashNvStorageVariableSize purely for convenience
> > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000
> > !endif
> > !endif
> > -!if $(TLS_ENABLE) == TRUE
> > +!if $(NETWORK_TLS_ENABLE) == TRUE
> > gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000
> >
> gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000
> > !endif
> > @@ -500,9 +500,10 @@
> >
> gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x
> 2
> > !endif
> >
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> > -!endif
> > + #
> > + # Network Pcds
> > + #
> > +!include NetworkPkg/NetworkPcds.dsc.inc
> >
> > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5,
> 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 }
> >
> > @@ -781,37 +782,8 @@
> > #
> > # Network Support
> > #
> > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - NetworkPkg/TcpDxe/TcpDxe.inf
> > - NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!if $(NETWORK_IP6_ENABLE) == TRUE
> > - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - NetworkPkg/DnsDxe/DnsDxe.inf
> > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - NetworkPkg/HttpDxe/HttpDxe.inf
> > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -!endif
> > -!if $(TLS_ENABLE) == TRUE
> > - NetworkPkg/TlsDxe/TlsDxe.inf
> > - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {
> > - <LibraryClasses>
> > - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf
> > - }
> > -!endif
> > +!include NetworkPkg/NetworkComponents.dsc.inc
>
> I have two comments on this part (the components):
>
> (6) Please be consistent with the comments that you add near the
> !include directives. In the current patch, you add comments for the libs
> and the PCDs, but not for the defines or the components. Please stick
> with one style -- either add zero comments, or add comments on all of
> the !includes.
Actually, for components I add "Network Support" in the comments, which looks like
aligning with nearby components. Do you thinks it is acceptable?
Thanks,
Shenglei
>
> (7) The above change is a bug, for TlsAuthConfigDxe. This is where you
> shoud put the feature from TianoCore#1449 to use. Namely, after the
> !include directive, you have to *repeat* TlsAuthConfigDxe, preserving
> the <LibraryClasses> override, from the original code. Otherwise, the
> TlsAuthConfigLib instance would not be hooked into the driver via NULL
> class resolution.
>
>
> > +
> > OvmfPkg/VirtioNetDxe/VirtioNet.inf
> >
> > #
>
> OK, so this is where "OvmfPkgIa32.dsc" ends.
>
> Clearly, my comments (2) through (7) apply to the other two DSC files as
> well: "OvmfPkgIa32X64.dsc", "OvmfPkgX64.dsc".
>
> Below, I'm going to make two more comments that are specific to
> "OvmfPkgIa32X64.dsc" and "OvmfPkgX64.dsc", respectively (I've moved the
> FDF changes to the end of the email):
>
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc
> b/OvmfPkg/OvmfPkgIa32X64.dsc
> > index 9b341e17d7..b28f412f84 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
>
> [...]
>
> > @@ -505,10 +505,10 @@
> >
> gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x
> 2
> > !endif
> >
> > -[PcdsFixedAtBuild.X64]
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> > -!endif
> > + #
> > + # Network Pcds
> > + #
> > +!include NetworkPkg/NetworkPcds.dsc.inc
> >
> > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5,
> 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 }
> >
>
> (8) We have a bug above: please do not remove the section header
> [PcdsFixedAtBuild.X64].
>
> [...]
>
> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> > index a0f87f74da..c4cea5aaaa 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
>
> [...]
>
> > @@ -788,37 +789,7 @@
> > #
> > # Network Support
> > #
> > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - NetworkPkg/TcpDxe/TcpDxe.inf
> > - NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!if $(NETWORK_IP6_ENABLE) == TRUE
> > - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - NetworkPkg/DnsDxe/DnsDxe.inf
> > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - NetworkPkg/HttpDxe/HttpDxe.inf
> > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -!endif
> > -!if $(TLS_ENABLE) == TRUE
> > - NetworkPkg/TlsDxe/TlsDxe.inf
> > - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {
> > - <LibraryClasses>
> > - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf
> > - }
> > -!endif
> > +!include NetworkPkg/NetworkComponents.dsc.inc
> > OvmfPkg/VirtioNetDxe/VirtioNet.inf
> >
> > #
>
> This is inconsistent with the other DSC file updates: in the IA32 and
> IA32X64 DSC files, you add an empty line after this !include directive,
> but you forgot it here.
>
> (9) Please add the empty line here as well.
>
>
> OK, let's see the FDF changes:
>
> > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> > index bc08bf2243..e428334702 100644
> > --- a/OvmfPkg/OvmfPkgIa32.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32.fdf
> > @@ -297,34 +297,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
> > #
> > # Network modules
> > #
> > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > - INF
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - INF NetworkPkg/TcpDxe/TcpDxe.inf
> > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!if $(NETWORK_IP6_ENABLE) == TRUE
> > - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - INF NetworkPkg/DnsDxe/DnsDxe.inf
> > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - INF NetworkPkg/HttpDxe/HttpDxe.inf
> > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -!endif
> > -!if $(TLS_ENABLE) == TRUE
> > - INF NetworkPkg/TlsDxe/TlsDxe.inf
> > - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> > -!endif
> > +!include NetworkPkg/Network.fdf.inc
> > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
> >
> > #
>
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> > index ccf36c5dd9..6ddffe7547 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> > @@ -303,34 +303,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
> > SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI
> > }
> > !endif
> > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > - INF
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - INF NetworkPkg/TcpDxe/TcpDxe.inf
> > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!if $(NETWORK_IP6_ENABLE) == TRUE
> > - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - INF NetworkPkg/DnsDxe/DnsDxe.inf
> > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - INF NetworkPkg/HttpDxe/HttpDxe.inf
> > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -!endif
> > -!if $(TLS_ENABLE) == TRUE
> > - INF NetworkPkg/TlsDxe/TlsDxe.inf
> > - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> > -!endif
> > +!include NetworkPkg/Network.fdf.inc
> > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
> >
> > #
>
> > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> > index ccf36c5dd9..6ddffe7547 100644
> > --- a/OvmfPkg/OvmfPkgX64.fdf
> > +++ b/OvmfPkg/OvmfPkgX64.fdf
> > @@ -303,34 +303,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
> > SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI
> > }
> > !endif
> > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> > - INF
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - INF NetworkPkg/TcpDxe/TcpDxe.inf
> > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -!if $(NETWORK_IP6_ENABLE) == TRUE
> > - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == TRUE
> > - INF NetworkPkg/DnsDxe/DnsDxe.inf
> > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - INF NetworkPkg/HttpDxe/HttpDxe.inf
> > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -!endif
> > -!if $(TLS_ENABLE) == TRUE
> > - INF NetworkPkg/TlsDxe/TlsDxe.inf
> > - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
> > -!endif
> > +!include NetworkPkg/Network.fdf.inc
> > INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
> >
> > #
> >
>
> The FDF changes look fine.
>
> Thanks!
> Laszlo
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40640): https://edk2.groups.io/g/devel/message/40640
Mute This Topic: https://groups.io/mt/31616136/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list