* [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF
@ 2019-05-20 7:07 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
` (17 more replies)
0 siblings, 18 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
We have plan to move all network related modules/libraries to
NetworkPkg. So in order to make these changes happen smoothly,
We update platforms' DSC/FDF to use Network's include segment files.
v2:1.Add Contributed-under tag in all patches,based on current edk2/master.
2.Modify changes in part of patch series.
v3:1.Remove Contributed-under tag in all patches.
2.Split 16/16 to 16/18, 17/18 and 18/18.
Shenglei Zhang (18):
Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF
Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF
Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF
Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF
Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF
Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
Platform/SgiPkg: Update FDF to use NetworkPkg FDF
Platform/RDKQemu: Update DSC to use NetworkPkg DSC.
Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF.
Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC
Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
.../AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +---------
.../AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +-------
Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +---
.../ArmVExpress-networking.fdf.inc | 12 +---
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 26 +++-----
Platform/Comcast/RDKQemu/RDKQemu.dsc | 34 ++++-------
Platform/Hisilicon/D03/D03.dsc | 26 ++++----
Platform/Hisilicon/D03/D03.fdf | 10 +---
Platform/Hisilicon/D05/D05.dsc | 59 ++++++-------------
Platform/Hisilicon/D05/D05.fdf | 23 +-------
Platform/Hisilicon/D06/D06.dsc | 42 ++++---------
Platform/Hisilicon/D06/D06.fdf | 27 +--------
Platform/Hisilicon/HiKey/HiKey.dsc | 26 ++++----
Platform/Hisilicon/HiKey/HiKey.fdf | 10 +---
Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++++----
Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +---
.../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +-------
.../Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +-------
.../Include/Dsc/CoreCommonLib.dsc | 11 ++--
.../BoardMtOlympus/PlatformPkg.dsc | 7 +++
.../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 +-------
.../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 ++
.../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 +-------
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++-----------
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 ++----------
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 ++-----------
Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++------
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +----
.../Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 +++
.../Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 +++
.../Socionext/DeveloperBox/DeveloperBox.dsc | 29 +++------
.../Socionext/DeveloperBox/DeveloperBox.fdf | 24 +-------
.../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++--------
.../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 +------
.../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++------
.../Overdrive1000Board/Overdrive1000Board.fdf | 16 +----
.../Armada80x0McBin/Armada80x0McBin.dsc | 8 +++
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-----
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +---
39 files changed, 193 insertions(+), 701 deletions(-)
--
2.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
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 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 02/18] Platform/VExpressPkg: " Zhang, Shenglei
` (16 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
v2: Remove TcpIoLib and HttpLib.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
.../AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +------------------
.../AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +-------------
2 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 5ba8e16a5a..6629009132 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -72,12 +72,6 @@ DEFINE X64EMU_ENABLE = FALSE
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -124,9 +118,7 @@ DEFINE X64EMU_ENABLE = FALSE
IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -635,28 +627,7 @@ DEFINE X64EMU_ENABLE = FALSE
#
# Networking stack
#
- 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/SnpDxe/SnpDxe.inf
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- NetworkPkg/DnsDxe/DnsDxe.inf
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- NetworkPkg/HttpDxe/HttpDxe.inf
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf
- NetworkPkg/TlsDxe/TlsDxe.inf
- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
#
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index b823cb1b46..851ae65b5b 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -187,28 +187,7 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- 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/SnpDxe/SnpDxe.inf
- INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- INF NetworkPkg/DnsDxe/DnsDxe.inf
- INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- INF NetworkPkg/HttpDxe/HttpDxe.inf
- INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
- INF NetworkPkg/TlsDxe/TlsDxe.inf
- INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 02/18] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 03/18] Hisilicon/D03: " Zhang, Shenglei
` (15 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
v2: Withdraw the unnecessary changes.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
.../ArmVExpress-networking.fdf.inc | 12 +--------
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 26 +++++++------------
2 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
index 6d060303b9..1ee2eeab01 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
@@ -7,17 +7,7 @@
#
# Networking stack
#
- 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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+!include NetworkPkg/Network.fdf.inc
!if $(INCLUDE_TFTP_COMMAND) == TRUE
#
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 7b5dc93a70..13f5c6c1e7 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -9,6 +9,14 @@
SECURE_BOOT_ENABLE = FALSE
INCLUDE_TFTP_COMMAND = TRUE
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_SNP_ENABLE = FALSE
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+
[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
@@ -54,12 +62,6 @@
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -409,17 +411,7 @@
#
# Networking stack
#
- 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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.dsc.inc
!ifdef EDK2_ENABLE_SMSC_91X
# SMSC LAN 91C111
EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 03/18] Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF
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 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Zhang, Shenglei
` (14 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Hisilicon/D03/D03.dsc | 26 +++++++++++---------------
Platform/Hisilicon/D03/D03.fdf | 10 +---------
2 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 60b0d6393e..7f4f3b002a 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -23,6 +23,16 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
+ #
+ # Network definition
+ #
+ 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
+ DEFINE NETWORK_VLAN_ENABLE = FALSE
+
!include Silicon/Hisilicon/Hisilicon.dsc.inc
[LibraryClasses.common]
@@ -34,13 +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
-
!ifdef $(FDT_ENABLE)
@@ -398,16 +403,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
-
+!include NetworkPkg/Network.dsc.inc
Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index f5d0c66f63..e44cb86282 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -240,15 +240,7 @@ READ_LOCK_STATUS = TRUE
INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf
INF Platform/Hisilicon/D03/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
+!include NetworkPkg/Network.fdf.inc
!ifdef $(FDT_ENABLE)
INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (2 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 03/18] Hisilicon/D03: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-21 11:57 ` Leif Lindholm
2019-05-20 7:07 ` [PATCH edk2-platforms V3 05/18] Hisilicon/D06: " Zhang, Shenglei
` (13 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm
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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 05/18] Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (3 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: " Zhang, Shenglei
` (12 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Hisilicon/D06/D06.dsc | 42 ++++++++--------------------------
Platform/Hisilicon/D06/D06.fdf | 27 +---------------------
2 files changed, 11 insertions(+), 58 deletions(-)
diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 5387daf553..269515c7a5 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -22,8 +22,14 @@
BUILD_TARGETS = DEBUG|NOOPT|RELEASE
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
- DEFINE NETWORK_IP6_ENABLE = FALSE
- DEFINE HTTP_BOOT_ENABLE = FALSE
+
+ #
+ # Network definition
+ #
+ 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
@@ -36,12 +42,8 @@
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
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
@@ -49,9 +51,8 @@
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-!if $(HTTP_BOOT_ENABLE) == TRUE
+!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
!endif
@@ -340,30 +341,7 @@
#
#network
#
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index 976b597647..f6cb3f6876 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -239,32 +239,7 @@ READ_LOCK_STATUS = TRUE
#
#Network
#
- INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf
-
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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
#
# PCI Support
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (4 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 05/18] Hisilicon/D06: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: " Zhang, Shenglei
` (11 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Hisilicon/HiKey/HiKey.dsc | 26 ++++++++++----------------
Platform/Hisilicon/HiKey/HiKey.fdf | 10 +---------
2 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc
index 44f21700dd..c785af6e69 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -22,6 +22,15 @@
DEFINE CONFIG_NO_DEBUGLIB = TRUE
+ #
+ # Network definition
+ #
+ 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
+ DEFINE NETWORK_VLAN_ENABLE = FALSE
!include Silicon/Hisilicon/Hisilicon.dsc.inc
[LibraryClasses.common]
@@ -47,12 +56,6 @@
# USB Requirements
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
- # Network Libraries
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
# VariableRuntimeDxe Requirements
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -239,16 +242,7 @@
#
# UEFI Network Stack
#
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
#
# AX88772 Ethernet Driver
#
diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf
index 3d85f01eca..2b2e3ad053 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -153,15 +153,7 @@ READ_LOCK_STATUS = TRUE
#
# UEFI Network Stack
#
- INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.fdf.inc
#
# AX88772 Ethernet Driver for Apple Ethernet Adapter
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (5 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: " Zhang, Shenglei
` (10 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++++++++++--------------
Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +----------
2 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
index db6e5b918d..151c6312f8 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -22,6 +22,15 @@
DEFINE CONFIG_NO_DEBUGLIB = TRUE
+ #
+ # Network definition
+ #
+ 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
+ DEFINE NETWORK_VLAN_ENABLE = FALSE
!include Silicon/Hisilicon/Hisilicon.dsc.inc
[LibraryClasses.common]
@@ -48,11 +57,6 @@
# Network Libraries
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
# VariableRuntimeDxe Requirements
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
@@ -223,16 +227,7 @@
#
# UEFI Network Stack
#
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.dsc.inc
#
# FAT filesystem + GPT/MBR partitioning
#
diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
index 01ae18499f..dcb3105d6e 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -147,16 +147,7 @@ READ_LOCK_STATUS = TRUE
#
# UEFI Network Stack
#
- INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
#
# FAT filesystem + GPT/MBR partitioning
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (6 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: " Zhang, Shenglei
` (9 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++++++---------------
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +-----------
2 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 525276a2b0..67830506ab 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -23,6 +23,13 @@ DEFINE NUM_CORES = 4
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/LeMaker/CelloBoard/CelloBoard.fdf
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+
################################################################################
#
# Library Class section - list of all Library Classes needed by this Platform.
@@ -69,13 +76,6 @@ DEFINE NUM_CORES = 4
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -574,19 +574,7 @@ DEFINE NUM_CORES = 4
#
# Networking stack
#
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.dsc.inc
#
# Core Info
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index a2098989a0..80c760464f 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -172,20 +172,7 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- 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/Ip4ConfigDxe/Ip4ConfigDxe.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 MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
#
# Core Info
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (7 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
` (8 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
.../Socionext/DeveloperBox/DeveloperBox.dsc | 29 +++++--------------
.../Socionext/DeveloperBox/DeveloperBox.fdf | 24 ++-------------
2 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 428e5d6459..e100700f6e 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -22,6 +22,11 @@
FLASH_DEFINITION = Platform/Socionext/DeveloperBox/DeveloperBox.fdf
BUILD_NUMBER = 1
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+
DEFINE DEBUG_ON_UART1 = FALSE
DEFINE SECURE_BOOT_ENABLE = FALSE
DEFINE X64EMU_ENABLE = FALSE
@@ -404,28 +409,8 @@
#
# Networking stack
#
- 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/SnpDxe/SnpDxe.inf
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- NetworkPkg/DnsDxe/DnsDxe.inf
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- NetworkPkg/HttpDxe/HttpDxe.inf
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf
- NetworkPkg/TlsDxe/TlsDxe.inf
- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.dsc.inc
+
Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
<LibraryClasses>
DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index b322fead62..da9290fd92 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -209,28 +209,8 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- 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/SnpDxe/SnpDxe.inf
- INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- INF NetworkPkg/DnsDxe/DnsDxe.inf
- INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- INF NetworkPkg/HttpDxe/HttpDxe.inf
- INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
- INF NetworkPkg/TlsDxe/TlsDxe.inf
- INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+!include NetworkPkg/Network.fdf.inc
+
INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (8 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-21 11:59 ` Leif Lindholm
2019-05-20 7:07 ` [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: " Zhang, Shenglei
` (7 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++++--------------
.../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++---------
2 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 189baa8659..ab1ab6f2de 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -22,6 +22,12 @@
FLASH_DEFINITION = Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
BUILD_NUMBER = 1
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_SNP_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+
[BuildOptions]
RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
@@ -49,11 +55,6 @@
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -113,9 +114,6 @@
SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-
NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
@@ -594,25 +592,8 @@
#
# Networking stack
#
- 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/Ip6Dxe/Ip6Dxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- NetworkPkg/DnsDxe/DnsDxe.inf
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- NetworkPkg/HttpDxe/HttpDxe.inf
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!include NetworkPkg/Network.dsc.inc
+
Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
<LibraryClasses>
DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 1c9795df3b..b1e0a53e61 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -186,25 +186,8 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- 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 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/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- INF NetworkPkg/DnsDxe/DnsDxe.inf
- INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
- INF NetworkPkg/HttpDxe/HttpDxe.inf
- INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!include NetworkPkg/Network.fdf.inc
+
INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (9 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: " Zhang, Shenglei
` (6 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
.../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++++++------------
.../Overdrive1000Board/Overdrive1000Board.fdf | 16 +----------
2 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index d74ad479af..f9b73edeb3 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -23,6 +23,14 @@ DEFINE NUM_CORES = 4
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
################################################################################
#
# Library Class section - list of all Library Classes needed by this Platform.
@@ -69,11 +77,6 @@ DEFINE NUM_CORES = 4
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -566,23 +569,11 @@ DEFINE NUM_CORES = 4
#
# Networking stack
#
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+!include NetworkPkg/Network.dsc.inc
MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
}
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# NetworkPkg/IScsiDxe/IScsiDxe.inf
#
# Core Info
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index 6581138a6c..6a9226476b 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -179,21 +179,7 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- 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/Ip4ConfigDxe/Ip4ConfigDxe.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 MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
#
# Core Info
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (10 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-21 12:04 ` Leif Lindholm
2019-05-20 7:07 ` [PATCH edk2-platforms V3 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Zhang, Shenglei
` (5 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
Armada80x0Db.dsc and Armada80x0McBin.dsc.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++
.../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-----------------
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +-----------
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 01532b4a00..8ee84902ef 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -46,6 +46,14 @@
FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index c6510bbbbd..5418ddcaa7 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -46,6 +46,14 @@
FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index d08013612f..ff9bd5dc8c 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -47,6 +47,14 @@
BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
CAPSULE_ENABLE = TRUE
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0cf5d8447a..cfbc172b4f 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -115,12 +115,6 @@
RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
- # Network support
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-
# These libraries are used by the dynamic EFI Shell commands
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
@@ -471,17 +465,7 @@
Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
# 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
+!include NetworkPkg/Network.dsc.inc
Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index d2bbdedcfa..6face86577 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -129,17 +129,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
# Network support
- 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
+!include NetworkPkg/Network.fdf.inc
INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (11 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC Zhang, Shenglei
` (4 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform FDF files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 527bbd825d..44e571a184 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -183,17 +183,7 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- 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 MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.fdf.inc
!ifdef EDK2_ENABLE_SMSC_91X
INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC.
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (12 preceding siblings ...)
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 ` 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
` (3 subsequent siblings)
17 siblings, 0 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel
This patch updates the platform DSC files to use the include fragment
files provided by NetworkPkg.
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 34 ++++++++--------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 75b835ce60..64b6699ae7 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -28,7 +28,14 @@
# -D FLAG=VALUE
#
DEFINE SECURE_BOOT_ENABLE = TRUE
- DEFINE HTTP_BOOT_ENABLE = TRUE
+
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_SNP_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE
!include ArmVirtPkg/ArmVirt.dsc.inc
@@ -339,29 +346,8 @@
#
# Networking stack
#
- 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/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
+
#
# SCSI Bus and Disk Driver
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF.
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (13 preceding siblings ...)
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 ` 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
` (2 subsequent siblings)
17 siblings, 1 reply; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 +----------
.../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 +++
.../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 +----------
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++----------------
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++--------------
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 +++---------------
6 files changed, 28 insertions(+), 150 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 098602b9d8..5827386977 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -714,33 +714,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
#
# Network Modules
#
+!include NetworkPkg/Network.fdf.inc
+
!if $(NETWORK_ENABLE) == TRUE
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
SECTION UI = "UNDI"
}
- 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/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
- INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- !endif
- !if $(NETWORK_VLAN_ENABLE) == TRUE
- INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- !endif
- !if $(NETWORK_ISCSI_ENABLE) == TRUE
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 6d556c1be2..61eca30be1 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT = TRUE
DEFINE LZMA_ENABLE = TRUE
DEFINE S4_ENABLE = TRUE
+
+#
+# Network definition
+#
DEFINE NETWORK_ENABLE = TRUE
DEFINE NETWORK_IP6_ENABLE = TRUE
DEFINE NETWORK_ISCSI_ENABLE = FALSE
DEFINE NETWORK_VLAN_ENABLE = FALSE
+DEFINE NETWORK_TLS_ENABLE = FALSE
+DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
DEFINE SATA_ENABLE = TRUE
DEFINE PCIESC_ENABLE = TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 1ba6124a69..a6859d3b6d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -670,33 +670,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
#
# Network Modules
#
+!include NetworkPkg/Network.fdf.inc
+
!if $(NETWORK_ENABLE) == TRUE
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
SECTION UI = "UNDI"
}
- 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/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- !if $(NETWORK_IP6_ENABLE) == TRUE
- INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
- INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- !endif
- !if $(NETWORK_VLAN_ENABLE) == TRUE
- INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- !endif
- !if $(NETWORK_ISCSI_ENABLE) == TRUE
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3a3d3e29e7..b9c4739e09 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -50,6 +50,8 @@
!include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt
!include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc
+ DEFINE PLATFORMX64_ENABLE = TRUE
+
!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
DEFINE EDK_DXE_ARCHITECTURE = X64
@@ -167,13 +169,7 @@
!if $(SCSI_ENABLE) == TRUE
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
!endif
-!if $(NETWORK_ENABLE) == TRUE
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-!endif
+
!if $(S3_ENABLE) == TRUE
S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
!endif
@@ -1451,42 +1447,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
}
+ #
+ # Network Stacks
+ #
+!include NetworkPkg/Network.dsc.inc
!if $(NETWORK_ENABLE) == TRUE
- !if $(NETWORK_ISCSI_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !endif
- !if $(NETWORK_VLAN_ENABLE) == TRUE
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- !endif
!if $(CSM_ENABLE) == TRUE
IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
!endif
!endif
-!if $(NETWORK_ENABLE) == TRUE
- #
- # UEFI network modules
- #
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- !endif
-!endif
-
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 69286bfc6f..c0ae9c02af 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -167,13 +167,7 @@
!if $(SCSI_ENABLE) == TRUE
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
!endif
-!if $(NETWORK_ENABLE) == TRUE
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-!endif
+
!if $(S3_ENABLE) == TRUE
S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
!endif
@@ -1438,40 +1432,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
}
+ #
+ # Network Stacks
+ #
+!include NetworkPkg/Network.dsc.inc
!if $(NETWORK_ENABLE) == TRUE
- !if $(NETWORK_ISCSI_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !endif
- !if $(NETWORK_VLAN_ENABLE) == TRUE
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- !endif
!if $(CSM_ENABLE) == TRUE
IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
!endif
!endif
-!if $(NETWORK_ENABLE) == TRUE
- #
- # UEFI network modules
- #
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- !endif
!endif
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 4a226cf03c..0cb1bb9a9c 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -50,6 +50,8 @@
!include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt
!include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc
+ DEFINE PLATFORMX64_ENABLE = TRUE
+
!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
DEFINE EDK_DXE_ARCHITECTURE = X64
@@ -167,13 +169,6 @@
!if $(SCSI_ENABLE) == TRUE
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
!endif
-!if $(NETWORK_ENABLE) == TRUE
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-!endif
!if $(S3_ENABLE) == TRUE
S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
!endif
@@ -1453,42 +1448,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
}
+ #
+ # Network Stacks
+ #
+!include NetworkPkg/Network.dsc.inc
!if $(NETWORK_ENABLE) == TRUE
- !if $(NETWORK_ISCSI_ENABLE) == TRUE
- NetworkPkg/IScsiDxe/IScsiDxe.inf
- !endif
- !if $(NETWORK_VLAN_ENABLE) == TRUE
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- !endif
!if $(CSM_ENABLE) == TRUE
IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
!endif
!endif
-!if $(NETWORK_ENABLE) == TRUE
- #
- # UEFI network modules
- #
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- !if $(NETWORK_IP6_ENABLE) == TRUE
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
- !endif
-!endif
-
!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (14 preceding siblings ...)
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-20 7:07 ` 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 7:07 ` [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
17 siblings, 1 reply; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Michael A Kubacki, Jiewen Yao, Shifei A Lu, Xiaohu Zhou
This patch updates the platform DSC files to use the include fragment
files provided by NetworkPkg. And add network related definition in
Purley PlatformPkg.dsc.
v3： Add "!include NetworkPkg/NetworkDefines.dsc.inc" in PlatformPkg.dsc
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>
---
.../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index de1a3965d7..a82d18a028 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -30,6 +30,13 @@
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
+ !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ !else
+ DEFINE NETWORK_ENABLE = FALSE
+ !endif
+!include NetworkPkg/NetworkDefines.dsc.inc
+
#
# Set the global variables
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (15 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Zhang, Shenglei
@ 2019-05-20 7:07 ` 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
17 siblings, 2 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Michael A Kubacki, Jiewen Yao, Shifei A Lu, Xiaohu Zhou
This patch updates the DSC file to use the include fragment files provided
by NetworkPkg. And add network related definition in CoreCommonLib.dsc.
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>
---
.../MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index efe02c99f3..23ab53dbfe 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -72,11 +72,12 @@
#
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+
+ #
+ # Network libraries
+ #
+!include NetworkPkg/NetworkLibs.dsc.inc
+
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
` (16 preceding siblings ...)
2019-05-20 7:07 ` [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: " Zhang, Shenglei
@ 2019-05-20 7:07 ` Zhang, Shenglei
2019-05-20 14:56 ` [edk2-devel] " Liming Gao
` (2 more replies)
17 siblings, 3 replies; 32+ messages in thread
From: Zhang, Shenglei @ 2019-05-20 7:07 UTC (permalink / raw)
To: devel; +Cc: Michael A Kubacki, Jiewen Yao, Shifei A Lu, Xiaohu Zhou
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>
---
.../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------
.../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.18.0.windows.1
^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
2019-05-20 7:07 ` [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: " Zhang, Shenglei
@ 2019-05-20 14:55 ` Liming Gao
2019-05-20 20:15 ` Kubacki, Michael A
1 sibling, 0 replies; 32+ messages in thread
From: Liming Gao @ 2019-05-20 14:55 UTC (permalink / raw)
To: devel@edk2.groups.io, Zhang, Shenglei
Cc: Kubacki, Michael A, Yao, Jiewen, Lu, Shifei A, Zhou, Bowen
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Zhang, Shenglei
> Sent: Monday, May 20, 2019 3:07 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>
> Subject: [edk2-devel] [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
>
> This patch updates the DSC file to use the include fragment files provided
> by NetworkPkg. And add network related definition in CoreCommonLib.dsc.
>
> 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>
> ---
> .../MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index efe02c99f3..23ab53dbfe 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -72,11 +72,12 @@
> #
> UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> +
> + #
> + # Network libraries
> + #
> +!include NetworkPkg/NetworkLibs.dsc.inc
> +
> OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>
> --
> 2.18.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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 ` Liming Gao
2019-05-20 20:23 ` Kubacki, Michael A
2019-05-21 1:50 ` Zhou, Bowen
2 siblings, 0 replies; 32+ messages in thread
From: Liming Gao @ 2019-05-20 14:56 UTC (permalink / raw)
To: devel@edk2.groups.io, Zhang, Shenglei
Cc: Kubacki, Michael A, Yao, Jiewen, Lu, Shifei A, Zhou, Bowen
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Zhang, Shenglei
> Sent: Monday, May 20, 2019 3:07 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou,
> Bowen <bowen.zhou@intel.com>
> Subject: [edk2-devel] [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
>
> 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>
> ---
> .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------
> .../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.18.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC.
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
1 sibling, 0 replies; 32+ messages in thread
From: Kubacki, Michael A @ 2019-05-20 20:15 UTC (permalink / raw)
To: Zhang, Shenglei, devel@edk2.groups.io
Cc: Yao, Jiewen, Lu, Shifei A, Zhou, Bowen
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, May 20, 2019 12:07 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
> <bowen.zhou@intel.com>
> Subject: [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg:
> Update DSC to use NetworkPkg DSC.
>
> This patch updates the DSC file to use the include fragment files provided by
> NetworkPkg. And add network related definition in CoreCommonLib.dsc.
>
> 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>
> ---
> .../MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index efe02c99f3..23ab53dbfe 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -72,11 +72,12 @@
> #
> UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> +
> + #
> + # Network libraries
> + #
> +!include NetworkPkg/NetworkLibs.dsc.inc
> +
>
> OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibN
> ull/OemHookStatusCodeLibNull.inf
>
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in
> f
>
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC
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
0 siblings, 0 replies; 32+ messages in thread
From: Kubacki, Michael A @ 2019-05-20 20:21 UTC (permalink / raw)
To: Zhang, Shenglei, devel@edk2.groups.io
Cc: Yao, Jiewen, Lu, Shifei A, Zhou, Bowen
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, May 20, 2019 12:07 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
> <bowen.zhou@intel.com>
> Subject: [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg:
> Update DSC to use NetworkPkg DSC
>
> This patch updates the platform DSC files to use the include fragment files
> provided by NetworkPkg. And add network related definition in Purley
> PlatformPkg.dsc.
>
> v3： Add "!include NetworkPkg/NetworkDefines.dsc.inc" in PlatformPkg.dsc
>
> 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>
> ---
> .../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> index de1a3965d7..a82d18a028 100644
> ---
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> +++
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> @@ -30,6 +30,13 @@
> BUILD_TARGETS = DEBUG|RELEASE
> SKUID_IDENTIFIER = DEFAULT
>
> + !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + !else
> + DEFINE NETWORK_ENABLE = FALSE
> + !endif
> +!include NetworkPkg/NetworkDefines.dsc.inc
> +
> #
> # Set the global variables
> #
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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
2 siblings, 0 replies; 32+ messages in thread
From: Kubacki, Michael A @ 2019-05-20 20:23 UTC (permalink / raw)
To: Zhang, Shenglei, devel@edk2.groups.io
Cc: Yao, Jiewen, Lu, Shifei A, Zhou, Bowen
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, May 20, 2019 12:07 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
> <bowen.zhou@intel.com>
> Subject: [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg:
> Update DSC/FDF to use NetworkPkg DSC/FDF
>
> 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>
> ---
> .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------
> .../Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +------------------
> 2 files changed, 2 insertions(+), 50 deletions(-)
>
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> index b9bb33eb7e..fceaadc100 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu
> +++ de.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/CoreAdvancedLateInclud
> e.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> index 66bf64f2c3..d980e673a8 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl
> +++ ude.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.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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
2 siblings, 0 replies; 32+ messages in thread
From: Zhou, Bowen @ 2019-05-21 1:50 UTC (permalink / raw)
To: Zhang, Shenglei, devel@edk2.groups.io
Cc: Kubacki, Michael A, Yao, Jiewen, Lu, Shifei A
Reviewed-by: Xiaohu Zhou <bowen.zhou@intel.com>
-----Original Message-----
From: Zhang, Shenglei
Sent: Monday, May 20, 2019 3:07 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen <bowen.zhou@intel.com>
Subject: [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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>
---
.../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------
.../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/CoreAdvancedDxeInclu
+++ de.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/CoreAdvancedLateIncl
+++ ude.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.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF.
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
0 siblings, 0 replies; 32+ messages in thread
From: Sun, Zailiang @ 2019-05-21 2:49 UTC (permalink / raw)
To: Zhang, Shenglei, devel@edk2.groups.io; +Cc: Qian, Yi
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, May 20, 2019 3:07 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg:
> Update DSC/FDF to use NetworkPkg DSC/FDF.
>
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 +----------
> .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 +++
> .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 +----------
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++----------------
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++--------------
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 +++---------------
> 6 files changed, 28 insertions(+), 150 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> index 098602b9d8..5827386977 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> @@ -714,33 +714,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-
> 51F89DAF56BA { # # Network Modules #
> +!include NetworkPkg/Network.fdf.inc
> +
> !if $(NETWORK_ENABLE) == TRUE
> FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
> SECTION PE32 =
> Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
> SECTION UI = "UNDI"
> }
> - 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/ArpDxe/ArpDxe.inf
> - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF NetworkPkg/TcpDxe/TcpDxe.inf
> - !if $(NETWORK_IP6_ENABLE) == TRUE
> - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - !endif
> - !if $(NETWORK_VLAN_ENABLE) == TRUE
> - INF
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - !endif
> - !if $(NETWORK_ISCSI_ENABLE) == TRUE
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> - !endif
> !endif
>
> !if $(CAPSULE_ENABLE)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> index 6d556c1be2..61eca30be1 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> @@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT = TRUE
>
> DEFINE LZMA_ENABLE = TRUE
> DEFINE S4_ENABLE = TRUE
> +
> +#
> +# Network definition
> +#
> DEFINE NETWORK_ENABLE = TRUE
> DEFINE NETWORK_IP6_ENABLE = TRUE
> DEFINE NETWORK_ISCSI_ENABLE = FALSE
> DEFINE NETWORK_VLAN_ENABLE = FALSE
> +DEFINE NETWORK_TLS_ENABLE = FALSE
> +DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
>
> DEFINE SATA_ENABLE = TRUE
> DEFINE PCIESC_ENABLE = TRUE
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> index 1ba6124a69..a6859d3b6d 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> @@ -670,33 +670,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-
> 51F89DAF56BA { # # Network Modules #
> +!include NetworkPkg/Network.fdf.inc
> +
> !if $(NETWORK_ENABLE) == TRUE
> FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
> SECTION PE32 =
> Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
> SECTION UI = "UNDI"
> }
> - 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/ArpDxe/ArpDxe.inf
> - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF NetworkPkg/TcpDxe/TcpDxe.inf
> - !if $(NETWORK_IP6_ENABLE) == TRUE
> - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - !endif
> - !if $(NETWORK_VLAN_ENABLE) == TRUE
> - INF
> MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - !endif
> - !if $(NETWORK_ISCSI_ENABLE) == TRUE
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> - !endif
> !endif
>
> !if $(CAPSULE_ENABLE)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 3a3d3e29e7..b9c4739e09 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -50,6 +50,8 @@
> !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt
> !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc
>
> + DEFINE PLATFORMX64_ENABLE = TRUE
> +
> !if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> DEFINE EDK_DXE_ARCHITECTURE = X64
> @@ -167,13 +169,7 @@
> !if $(SCSI_ENABLE) == TRUE
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> !endif
> -!if $(NETWORK_ENABLE) == TRUE
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -!endif
> +
> !if $(S3_ENABLE) == TRUE
> S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> !endif
> @@ -1451,42 +1447,17 @@
> $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT
> PMInitPeim.inf
> }
>
>
> + #
> + # Network Stacks
> + #
> +!include NetworkPkg/Network.dsc.inc
>
> !if $(NETWORK_ENABLE) == TRUE
> - !if $(NETWORK_ISCSI_ENABLE) == TRUE
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> - !endif
> - !if $(NETWORK_VLAN_ENABLE) == TRUE
> - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - !endif
> !if $(CSM_ENABLE) == TRUE
> IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
> !endif
> !endif
>
> -!if $(NETWORK_ENABLE) == TRUE
> - #
> - # UEFI network modules
> - #
> - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -
> - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/TcpDxe/TcpDxe.inf
> - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - !if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - !endif
> -!endif
> -
> !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
> MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
> MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 69286bfc6f..c0ae9c02af 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -167,13 +167,7 @@
> !if $(SCSI_ENABLE) == TRUE
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> !endif
> -!if $(NETWORK_ENABLE) == TRUE
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -!endif
> +
> !if $(S3_ENABLE) == TRUE
> S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> !endif
> @@ -1438,40 +1432,17 @@
> $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT
> PMInitPeim.inf
> }
>
>
> + #
> + # Network Stacks
> + #
> +!include NetworkPkg/Network.dsc.inc
>
> !if $(NETWORK_ENABLE) == TRUE
> - !if $(NETWORK_ISCSI_ENABLE) == TRUE
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> - !endif
> - !if $(NETWORK_VLAN_ENABLE) == TRUE
> - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - !endif
> !if $(CSM_ENABLE) == TRUE
> IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
> !endif
> !endif
>
> -!if $(NETWORK_ENABLE) == TRUE
> - #
> - # UEFI network modules
> - #
> - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -
> - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/TcpDxe/TcpDxe.inf
> - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - !if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - !endif
> !endif
>
> !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 4a226cf03c..0cb1bb9a9c 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -50,6 +50,8 @@
> !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt
> !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc
>
> + DEFINE PLATFORMX64_ENABLE = TRUE
> +
> !if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> DEFINE EDK_DXE_ARCHITECTURE = X64
> @@ -167,13 +169,6 @@
> !if $(SCSI_ENABLE) == TRUE
> UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> !endif
> -!if $(NETWORK_ENABLE) == TRUE
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -!endif
> !if $(S3_ENABLE) == TRUE
> S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
> !endif
> @@ -1453,42 +1448,17 @@
> $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT
> PMInitPeim.inf
> }
>
>
> + #
> + # Network Stacks
> + #
> +!include NetworkPkg/Network.dsc.inc
>
> !if $(NETWORK_ENABLE) == TRUE
> - !if $(NETWORK_ISCSI_ENABLE) == TRUE
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> - !endif
> - !if $(NETWORK_VLAN_ENABLE) == TRUE
> - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - !endif
> !if $(CSM_ENABLE) == TRUE
> IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
> !endif
> !endif
>
> -!if $(NETWORK_ENABLE) == TRUE
> - #
> - # UEFI network modules
> - #
> - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -
> - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/TcpDxe/TcpDxe.inf
> - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - !if $(NETWORK_IP6_ENABLE) == TRUE
> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - !endif
> -!endif
> -
> !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
> MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
> MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-20 7:07 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Zhang, Shenglei
@ 2019-05-21 11:57 ` Leif Lindholm
2019-05-21 13:39 ` [edk2-devel] " Liming Gao
0 siblings, 1 reply; 32+ messages in thread
From: Leif Lindholm @ 2019-05-21 11:57 UTC (permalink / raw)
To: Shenglei Zhang; +Cc: devel
On Mon, May 20, 2019 at 03:07:15PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
>
> v2: Withdraw unrelated changes.
Any comments on changes since previous patch go underneath the "---"
line below - they do not belong in the commit message.
> 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
This no-op change needs to go.
Please verify the patches manually before resubmitting.
> 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
This no-op change needs to go.
Please verify the patches manually before resubmitting.
>
> [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
This no-op change needs to go.
Please verify the patches manually before resubmitting.
>
> 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
This no-op change needs to go.
Please verify the patches manually before resubmitting.
> 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
> + }
This no-op change needs to go.
Please verify the patches manually before resubmitting.
/
Leif
> 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
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
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
0 siblings, 1 reply; 32+ messages in thread
From: Leif Lindholm @ 2019-05-21 11:59 UTC (permalink / raw)
To: Shenglei Zhang; +Cc: devel
On Mon, May 20, 2019 at 03:07:21PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
>
> v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.
Any notes on changes go under the "---" line below.
If you delete this revision comment before committing:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++++--------------
> .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++---------
> 2 files changed, 10 insertions(+), 46 deletions(-)
>
> diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> index 189baa8659..ab1ab6f2de 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> @@ -22,6 +22,12 @@
> FLASH_DEFINITION = Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> BUILD_NUMBER = 1
>
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_SNP_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> +
> [BuildOptions]
> RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
>
> @@ -49,11 +55,6 @@
>
> BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
>
> - # Networking Requirements
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
>
> # ARM Architectural Libraries
> CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> @@ -113,9 +114,6 @@
> SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
> PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
>
> - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -
> NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
> NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
>
> @@ -594,25 +592,8 @@
> #
> # Networking stack
> #
> - 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/Ip6Dxe/Ip6Dxe.inf
> - NetworkPkg/TcpDxe/TcpDxe.inf
> - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - NetworkPkg/IScsiDxe/IScsiDxe.inf
> - NetworkPkg/DnsDxe/DnsDxe.inf
> - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> - NetworkPkg/HttpDxe/HttpDxe.inf
> - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> +!include NetworkPkg/Network.dsc.inc
> +
> Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
> <LibraryClasses>
> DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
> diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> index 1c9795df3b..b1e0a53e61 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> @@ -186,25 +186,8 @@ READ_LOCK_STATUS = TRUE
> #
> # Networking stack
> #
> - 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 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/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> - INF NetworkPkg/DnsDxe/DnsDxe.inf
> - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> - INF NetworkPkg/HttpDxe/HttpDxe.inf
> - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> +!include NetworkPkg/Network.fdf.inc
> +
> INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
>
> #
> --
> 2.18.0.windows.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
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
0 siblings, 1 reply; 32+ messages in thread
From: Leif Lindholm @ 2019-05-21 12:04 UTC (permalink / raw)
To: Shenglei Zhang; +Cc: devel
On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
>
> v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
> Armada80x0Db.dsc and Armada80x0McBin.dsc.
Version comments go below "---" line.
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++
> Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++
> .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++
Please follow
https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers
when generating and submitting patches. That way we get to see the
whole path of the files being modified.
/
Leif
> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-----------------
> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +-----------
> 5 files changed, 26 insertions(+), 28 deletions(-)
>
> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> index 01532b4a00..8ee84902ef 100644
> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> @@ -46,6 +46,14 @@
> FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
>
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> +
> !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>
> [LibraryClasses.common]
> diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> index c6510bbbbd..5418ddcaa7 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> @@ -46,6 +46,14 @@
> FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
>
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> +
> !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>
> [LibraryClasses.common]
> diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> index d08013612f..ff9bd5dc8c 100644
> --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> @@ -47,6 +47,14 @@
> BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> CAPSULE_ENABLE = TRUE
>
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> +
> !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>
> [LibraryClasses.common]
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 0cf5d8447a..cfbc172b4f 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -115,12 +115,6 @@
> RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
>
> - # Network support
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -
> # These libraries are used by the dynamic EFI Shell commands
> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> @@ -471,17 +465,7 @@
> Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>
> # 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
> +!include NetworkPkg/Network.dsc.inc
> Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
> Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
> Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index d2bbdedcfa..6face86577 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -129,17 +129,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
> INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>
> # Network support
> - 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
> +!include NetworkPkg/Network.fdf.inc
> INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
> INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
> INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> --
> 2.18.0.windows.1
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-21 12:04 ` Leif Lindholm
@ 2019-05-21 13:16 ` Liming Gao
0 siblings, 0 replies; 32+ messages in thread
From: Liming Gao @ 2019-05-21 13:16 UTC (permalink / raw)
To: devel@edk2.groups.io, leif.lindholm@linaro.org, Zhang, Shenglei
Leif:
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif Lindholm
> Sent: Tuesday, May 21, 2019 8:04 PM
> To: Zhang, Shenglei <shenglei.zhang@intel.com>
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF
>
> On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
> > Armada80x0Db.dsc and Armada80x0McBin.dsc.
>
> Version comments go below "---" line.
>
I will remove the version info in the commit message. Can I add your RB for this patch?
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> > ---
> > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++
> > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++
> > .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++
>
> Please follow
> https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers
> when generating and submitting patches. That way we get to see the
> whole path of the files being modified.
>
Yes. I will follow this rule to generate the patch with the full file path.
> /
> Leif
>
> > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-----------------
> > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +-----------
> > 5 files changed, 26 insertions(+), 28 deletions(-)
> >
> > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > index 01532b4a00..8ee84902ef 100644
> > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
> > @@ -46,6 +46,14 @@
> > FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> > BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
> >
> > + #
> > + # Network definition
> > + #
> > + DEFINE NETWORK_IP6_ENABLE = FALSE
> > + DEFINE NETWORK_TLS_ENABLE = FALSE
> > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> > + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> > +
> > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> > [LibraryClasses.common]
> > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > index c6510bbbbd..5418ddcaa7 100644
> > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
> > @@ -46,6 +46,14 @@
> > FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> > BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> >
> > + #
> > + # Network definition
> > + #
> > + DEFINE NETWORK_IP6_ENABLE = FALSE
> > + DEFINE NETWORK_TLS_ENABLE = FALSE
> > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> > + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> > +
> > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> > [LibraryClasses.common]
> > diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > index d08013612f..ff9bd5dc8c 100644
> > --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> > @@ -47,6 +47,14 @@
> > BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> > CAPSULE_ENABLE = TRUE
> >
> > + #
> > + # Network definition
> > + #
> > + DEFINE NETWORK_IP6_ENABLE = FALSE
> > + DEFINE NETWORK_TLS_ENABLE = FALSE
> > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> > + DEFINE NETWORK_ISCSI_ENABLE = FALSE
> > +
> > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> >
> > [LibraryClasses.common]
> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > index 0cf5d8447a..cfbc172b4f 100644
> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> > @@ -115,12 +115,6 @@
> > RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
> > ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> >
> > - # Network support
> > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -
> > # These libraries are used by the dynamic EFI Shell commands
> > ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> > @@ -471,17 +465,7 @@
> > Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
> >
> > # 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
> > +!include NetworkPkg/Network.dsc.inc
> > Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
> > Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
> > Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> > index d2bbdedcfa..6face86577 100644
> > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> > @@ -129,17 +129,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
> > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
> >
> > # Network support
> > - 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
> > +!include NetworkPkg/Network.fdf.inc
> > INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
> > INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
> > INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> > --
> > 2.18.0.windows.1
> >
>
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-21 11:59 ` Leif Lindholm
@ 2019-05-21 13:17 ` Liming Gao
0 siblings, 0 replies; 32+ messages in thread
From: Liming Gao @ 2019-05-21 13:17 UTC (permalink / raw)
To: devel@edk2.groups.io, leif.lindholm@linaro.org, Zhang, Shenglei
Leif:
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif Lindholm
> Sent: Tuesday, May 21, 2019 7:59 PM
> To: Zhang, Shenglei <shenglei.zhang@intel.com>
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
>
> On Mon, May 20, 2019 at 03:07:21PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf.
>
> Any notes on changes go under the "---" line below.
> If you delete this revision comment before committing:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
I will remove the version in the commit message.
Thanks for your review.
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> > ---
> > .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++++--------------
> > .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++---------
> > 2 files changed, 10 insertions(+), 46 deletions(-)
> >
> > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > index 189baa8659..ab1ab6f2de 100644
> > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> > @@ -22,6 +22,12 @@
> > FLASH_DEFINITION = Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > BUILD_NUMBER = 1
> >
> > + #
> > + # Network definition
> > + #
> > + DEFINE NETWORK_SNP_ENABLE = FALSE
> > + DEFINE NETWORK_TLS_ENABLE = FALSE
> > +
> > [BuildOptions]
> > RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
> >
> > @@ -49,11 +55,6 @@
> >
> > BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> >
> > - # Networking Requirements
> > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> >
> > # ARM Architectural Libraries
> > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> > @@ -113,9 +114,6 @@
> > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
> > PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
> >
> > - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> > -
> > NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
> > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
> >
> > @@ -594,25 +592,8 @@
> > #
> > # Networking stack
> > #
> > - 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/Ip6Dxe/Ip6Dxe.inf
> > - NetworkPkg/TcpDxe/TcpDxe.inf
> > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - NetworkPkg/IScsiDxe/IScsiDxe.inf
> > - NetworkPkg/DnsDxe/DnsDxe.inf
> > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - NetworkPkg/HttpDxe/HttpDxe.inf
> > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > +!include NetworkPkg/Network.dsc.inc
> > +
> > Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf {
> > <LibraryClasses>
> > DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf
> > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > index 1c9795df3b..b1e0a53e61 100644
> > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> > @@ -186,25 +186,8 @@ READ_LOCK_STATUS = TRUE
> > #
> > # Networking stack
> > #
> > - 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 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/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> > - INF NetworkPkg/DnsDxe/DnsDxe.inf
> > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > - INF NetworkPkg/HttpDxe/HttpDxe.inf
> > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > +!include NetworkPkg/Network.fdf.inc
> > +
> > INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
> >
> > #
> > --
> > 2.18.0.windows.1
> >
>
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
2019-05-21 11:57 ` Leif Lindholm
@ 2019-05-21 13:39 ` Liming Gao
0 siblings, 0 replies; 32+ messages in thread
From: Liming Gao @ 2019-05-21 13:39 UTC (permalink / raw)
To: devel@edk2.groups.io, leif.lindholm@linaro.org, Zhang, Shenglei
Leif:
The unnecessary change is caused by the line ending. I send the new version patch. Please help review it.
On version info, I agree not to add them in the commit message. We can describe them in the cover letter so that people know what changes in this version.
Thanks
Liming
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Leif Lindholm
> Sent: Tuesday, May 21, 2019 7:58 PM
> To: Zhang, Shenglei <shenglei.zhang@intel.com>
> Cc: devel@edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
>
> On Mon, May 20, 2019 at 03:07:15PM +0800, Shenglei Zhang wrote:
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > v2: Withdraw unrelated changes.
>
> Any comments on changes since previous patch go underneath the "---"
> line below - they do not belong in the commit message.
>
> > 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
>
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
>
> > 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
>
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
>
> >
> > [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
>
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
>
> >
> > 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
>
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
>
> > 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
> > + }
>
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
>
> /
> Leif
>
> > 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
> >
>
>
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2019-05-21 13:39 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Zhang, Shenglei
2019-05-21 11:57 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox