From: "Zhang, Shenglei" <shenglei.zhang@intel.com>
To: devel@edk2.groups.io
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Andrew Fish <afish@apple.com>, Ruiyu Ni <ruiyu.ni@intel.com>
Subject: [PATCH 4/4] EmulatorPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
Date: Tue, 14 May 2019 15:39:38 +0800 [thread overview]
Message-ID: <20190514073938.21528-5-shenglei.zhang@intel.com> (raw)
In-Reply-To: <20190514073938.21528-1-shenglei.zhang@intel.com>
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.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
EmulatorPkg/EmulatorPkg.dsc | 32 +++++++++++++++-----------------
EmulatorPkg/EmulatorPkg.fdf | 10 +---------
2 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index de20f81046..f63e7166a4 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -23,6 +23,19 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = EmulatorPkg/EmulatorPkg.fdf
+ #
+ # Network stack drivers
+ #
+
+ #
+ # EmuSnpDxe.inf will be used.
+ #
+ DEFINE NETWORK_SNP_ENABLE = FALSE
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
[SkuIds]
0|DEFAULT
@@ -68,10 +81,6 @@
# Generic Modules
#
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.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
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
@@ -357,19 +366,6 @@
MdeModulePkg/Application/HelloWorld/HelloWorld.inf
- #
- # Network stack drivers
- #
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
-
MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
@@ -412,6 +408,8 @@
!endif
+!include NetworkPkg/Network.dsc.inc
+
[BuildOptions]
MSFT:DEBUG_*_*_CC_FLAGS = /Od /Oy-
MSFT:NOOPT_*_*_CC_FLAGS = /Od /Oy-
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 94a060c999..ec411e82b4 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -190,15 +190,7 @@ INF MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
!if $(NETWORK_SUPPORT)
INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
!endif
-INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.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/MnpDxe/MnpDxe.inf
-INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-INF NetworkPkg/TcpDxe/TcpDxe.inf
-INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+!include NetworkPkg/Network.fdf.inc
INF FatPkg/EnhancedFatDxe/Fat.inf
--
2.18.0.windows.1
next prev parent reply other threads:[~2019-05-14 7:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 7:39 [PATCH 0/4] Add DSC/FDF include segment files for network stack Zhang, Shenglei
2019-05-14 7:39 ` [PATCH 1/4] OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file Zhang, Shenglei
2019-05-14 12:55 ` [edk2-devel] " Liming Gao
2019-05-14 13:48 ` Laszlo Ersek
2019-05-15 7:02 ` Zhang, Shenglei
2019-05-15 8:10 ` Laszlo Ersek
2019-05-14 7:39 ` [PATCH 2/4] Nt32Pkg: " Zhang, Shenglei
2019-05-14 12:44 ` Ni, Ray
2019-05-14 7:39 ` [PATCH 3/4] ArmVirtPkg: " Zhang, Shenglei
2019-05-14 14:22 ` [edk2-devel] " Laszlo Ersek
2019-05-14 7:39 ` Zhang, Shenglei [this message]
2019-05-14 12:44 ` [edk2-devel] [PATCH 4/4] EmulatorPkg: " Ni, Ray
2019-05-14 12:43 ` [edk2-devel] [PATCH 0/4] Add DSC/FDF include segment files for network stack Laszlo Ersek
2019-05-14 12:59 ` Liming Gao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190514073938.21528-5-shenglei.zhang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox