From: "Zhang, Shenglei" <shenglei.zhang@intel.com>
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Subject: [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
Date: Mon, 20 May 2019 15:07:15 +0800 [thread overview]
Message-ID: <20190520070729.30812-5-shenglei.zhang@intel.com> (raw)
In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com>
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
v2: Withdraw unrelated changes.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Platform/Hisilicon/D05/D05.dsc | 59 ++++++++++------------------------
Platform/Hisilicon/D05/D05.fdf | 23 +------------
2 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index dc9e1407ba..239bc776f9 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
@@ -89,10 +87,10 @@
LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf
SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
- PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
+ PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
- PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
+ PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
[LibraryClasses.common.SEC]
ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
@@ -130,7 +128,7 @@
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdCoreCount|8
- gArmTokenSpaceGuid.PcdPciIoTranslation|0
+ gArmTokenSpaceGuid.PcdPciIoTranslation|0
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
@@ -466,7 +464,7 @@
ArmPkg/Drivers/CpuDxe/CpuDxe.inf
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
- ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
+ ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf
@@ -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
@@ -602,10 +577,10 @@
<LibraryClasses>
NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
}
- Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {
+ Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {
<LibraryClasses>
- NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
- }
+ NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
+ }
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
<LibraryClasses>
NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.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.18.0.windows.1
next prev parent reply other threads:[~2019-05-20 7:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 02/18] Platform/VExpressPkg: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 03/18] Hisilicon/D03: " Zhang, Shenglei
2019-05-20 7:07 ` Zhang, Shenglei [this message]
2019-05-21 11:57 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Leif Lindholm
2019-05-21 13:39 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 05/18] Hisilicon/D06: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
2019-05-21 11:59 ` Leif Lindholm
2019-05-21 13:17 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: " Zhang, Shenglei
2019-05-21 12:04 ` Leif Lindholm
2019-05-21 13:16 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-21 2:49 ` Sun, Zailiang
2019-05-20 7:07 ` [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Zhang, Shenglei
2019-05-20 20:21 ` Kubacki, Michael A
2019-05-20 7:07 ` [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: " Zhang, Shenglei
2019-05-20 14:55 ` [edk2-devel] " Liming Gao
2019-05-20 20:15 ` Kubacki, Michael A
2019-05-20 7:07 ` [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-20 14:56 ` [edk2-devel] " Liming Gao
2019-05-20 20:23 ` Kubacki, Michael A
2019-05-21 1:50 ` Zhou, Bowen
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=20190520070729.30812-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