From: "Liming Gao" <liming.gao@intel.com>
To: devel@edk2.groups.io
Cc: Shenglei Zhang <shenglei.zhang@intel.com>,
Michael A Kubacki <michael.a.kubacki@intel.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Shifei A Lu <shifei.a.lu@intel.com>,
Xiaohu Zhou <bowen.zhou@intel.com>
Subject: [Patch edk2-platform V4 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
Date: Tue, 21 May 2019 21:36:23 +0800 [thread overview]
Message-ID: <20190521133623.20404-19-liming.gao@intel.com> (raw)
In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com>
From: Shenglei Zhang <shenglei.zhang@intel.com>
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg. And add network related definition in
CoreAdvancedDxeInclude.dsc/fdf.
Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Xiaohu Zhou <bowen.zhou@intel.com>
---
Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +-------------------------
Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +-------------------------
2 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index b9bb33eb7e..fceaadc100 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -11,31 +11,7 @@
#
# UEFI network modules
#
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
- NetworkPkg/DnsDxe/DnsDxe.inf
- NetworkPkg/HttpDxe/HttpDxe.inf
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+ !include NetworkPkg/NetworkComponents.dsc.inc
!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
index 66bf64f2c3..d980e673a8 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -11,31 +11,7 @@
#
# UEFI network modules
#
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
-INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
-INF NetworkPkg/TcpDxe/TcpDxe.inf
-INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
-INF NetworkPkg/DnsDxe/DnsDxe.inf
-INF NetworkPkg/HttpDxe/HttpDxe.inf
-INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
-INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+!include NetworkPkg/Network.fdf.inc
!if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
--
2.13.0.windows.1
prev parent reply other threads:[~2019-05-21 13:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 13:36 [Patch edk2-platform V4 00/18] Add Network's include segment files in DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 02/18] Platform/VExpressPkg: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 03/18] Hisilicon/D03: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 04/18] Hisilicon/D05: " Liming Gao
2019-05-23 16:59 ` [edk2-devel] " Leif Lindholm
2019-05-21 13:36 ` [Patch edk2-platform V4 05/18] Hisilicon/D06: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 06/18] Hisilicon/HiKey: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 07/18] Hisilicon/HiKey960: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 08/18] Platform/CelloBoard: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 09/18] Platform/DeveloperBox: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 10/18] Platform/SynQuacerEvalBoard: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 11/18] Platform/Overdrive1000Board: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 12/18] Silicon/Armada7k8k: " Liming Gao
2019-05-23 17:00 ` Leif Lindholm
2019-05-21 13:36 ` [Patch edk2-platform V4 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 17/18] Platform/MinPlatformPkg: " Liming Gao
2019-05-21 13:36 ` Liming Gao [this message]
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=20190521133623.20404-19-liming.gao@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