From: "Liming Gao" <liming.gao@intel.com>
To: devel@edk2.groups.io
Cc: Shenglei Zhang <shenglei.zhang@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: [Patch edk2-platform V4 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
Date: Tue, 21 May 2019 21:36:09 +0800 [thread overview]
Message-ID: <20190521133623.20404-5-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.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Platform/Hisilicon/D05/D05.dsc | 45 ++++++++++-----------------------------------
Platform/Hisilicon/D05/D05.fdf | 23 +----------------------
2 files changed, 11 insertions(+), 57 deletions(-)
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index dc9e1407ba..3c04b7ee24 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -23,8 +23,15 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
DEFINE EDK2_SKIP_PEICORE=0
- DEFINE NETWORK_IP6_ENABLE = FALSE
- DEFINE HTTP_BOOT_ENABLE = FALSE
+
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_SNP_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_VLAN_ENABLE = FALSE
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
!include Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -37,12 +44,8 @@
IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
@@ -50,11 +53,6 @@
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-
-!if $(HTTP_BOOT_ENABLE) == TRUE
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
!ifdef $(FDT_ENABLE)
#FDTUpdateLib
@@ -532,30 +530,7 @@
Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
-
-
+!include NetworkPkg/Network.dsc.inc
Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 812f7f2690..c18f23482f 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -246,28 +246,7 @@ READ_LOCK_STATUS = TRUE
INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
INF Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf
- INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
+!include NetworkPkg/Network.fdf.inc
!ifdef $(FDT_ENABLE)
INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
--
2.13.0.windows.1
next 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 ` Liming Gao [this message]
2019-05-23 16:59 ` [edk2-devel] [Patch edk2-platform V4 04/18] Hisilicon/D05: " 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 ` [Patch edk2-platform V4 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF 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=20190521133623.20404-5-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