[PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF
@ 2019-05-15  8:56 Zhang, Shenglei
  2019-05-15  8:56 ` [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
                   ` (17 more replies)
  0 siblings, 18 replies; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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.

Shenglei Zhang (16):
  Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment
    file.
  Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include
    fragment file.
  Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment
    file.
  Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment
    file.
  Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment
    file.
  Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment
    file.
  Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include
    fragment file.
  Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include
    fragment file.
  Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment
    file.
  Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's
    fragment file.
  Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's
    fragment file.
  Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include
    fragment file.
  Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
  Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment
    file.
  Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's
    fragment file.
  Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's
    fragment file.

 .../AMD/OverdriveBoard/OverdriveBoard.dsc     | 29 +---------
 .../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          | 36 ++++--------
 Platform/Hisilicon/D03/D03.dsc                | 26 ++++-----
 Platform/Hisilicon/D03/D03.fdf                | 10 +---
 Platform/Hisilicon/D05/D05.dsc                | 56 ++++++-------------
 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            |  6 ++
 .../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 +----
 .../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 +-----
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++------
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +---
 36 files changed, 178 insertions(+), 696 deletions(-)

-- 
2.18.0.windows.1


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 15:32   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
                   ` (16 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 .../AMD/OverdriveBoard/OverdriveBoard.dsc     | 29 +------------------
 .../AMD/OverdriveBoard/OverdriveBoard.fdf     | 23 +--------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 39b5dad154..b85b7aa03e 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -78,12 +78,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
@@ -641,28 +635,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 2aaf83084e..49af46cd16 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -193,28 +193,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] 34+ messages in thread

* [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
  2019-05-15  8:56 ` [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 16:24   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 03/16] Hisilicon/D03: " Zhang, Shenglei
                   ` (15 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 .../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 b647f65ad1..887b8dd72d 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
@@ -14,17 +14,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 e7a77c0ad9..7e10f62ca1 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -15,6 +15,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
 
@@ -60,12 +68,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
@@ -415,17 +417,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] 34+ messages in thread

* [PATCH edk2-platforms 03/16] Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
  2019-05-15  8:56 ` [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
  2019-05-15  8:56 ` [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 16:41   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 04/16] Hisilicon/D05: " Zhang, Shenglei
                   ` (14 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 07ff461277..d98997c59e 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -29,6 +29,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]
@@ -40,13 +50,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)
@@ -404,16 +409,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 3f07b2e577..fc8a2945ea 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -246,15 +246,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] 34+ messages in thread

* [PATCH edk2-platforms 04/16] Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (2 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 03/16] Hisilicon/D03: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 16:57   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 05/16] Hisilicon/D06: " Zhang, Shenglei
                   ` (13 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 Platform/Hisilicon/D05/D05.dsc | 56 +++++++++++-----------------------
 Platform/Hisilicon/D05/D05.fdf | 23 +-------------
 2 files changed, 19 insertions(+), 60 deletions(-)

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 70b044c7e3..878ab5adf6 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -29,8 +29,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
 
@@ -43,12 +50,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
@@ -58,7 +61,7 @@
 
   TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
 
-!if $(HTTP_BOOT_ENABLE) == TRUE
+!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
 !endif
 
@@ -95,10 +98,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
@@ -136,7 +139,7 @@
 
 [PcdsFixedAtBuild.common]
   gArmPlatformTokenSpaceGuid.PcdCoreCount|8
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0
+  gArmTokenSpaceGuid.PcdPciIoTranslation|0
 
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
 
@@ -472,7 +475,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
@@ -538,30 +541,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
@@ -608,10 +588,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 9632aea4b0..21e04ce9a8 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -252,28 +252,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] 34+ messages in thread

* [PATCH edk2-platforms 05/16] Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (3 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 04/16] Hisilicon/D05: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 17:02   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 06/16] Hisilicon/HiKey: " Zhang, Shenglei
                   ` (12 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 73bea728b0..e6cd975255 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -28,8 +28,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
 
@@ -42,12 +48,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
@@ -55,9 +57,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
 
@@ -346,30 +347,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 e402628a1b..fda896097a 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -245,32 +245,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] 34+ messages in thread

* [PATCH edk2-platforms 06/16] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (4 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 05/16] Hisilicon/D06: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 19:23   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: " Zhang, Shenglei
                   ` (11 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 7e05babb6c..2081e95b06 100644
--- a/Platform/Hisilicon/HiKey/HiKey.dsc
+++ b/Platform/Hisilicon/HiKey/HiKey.dsc
@@ -28,6 +28,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]
@@ -53,12 +62,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
@@ -245,16 +248,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 7e6c8083bb..aadbfc0075 100644
--- a/Platform/Hisilicon/HiKey/HiKey.fdf
+++ b/Platform/Hisilicon/HiKey/HiKey.fdf
@@ -159,15 +159,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] 34+ messages in thread

* [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (5 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 06/16] Hisilicon/HiKey: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 19:23   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 08/16] Platform/CelloBoard: " Zhang, Shenglei
                   ` (10 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 a4a1a371de..f127159138 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
+++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
@@ -28,6 +28,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]
@@ -54,11 +63,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
@@ -229,16 +233,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 1b07284dc8..def66d41d4 100644
--- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
+++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
@@ -153,16 +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
   #
   # FAT filesystem + GPT/MBR partitioning
   #
-- 
2.18.0.windows.1


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [PATCH edk2-platforms 08/16] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (6 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:06   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
                   ` (9 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 bc2f3e2076..85ef45093a 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -29,6 +29,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.
@@ -75,13 +82,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
@@ -580,19 +580,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 d34b986b93..eae0019a1b 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -178,20 +178,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] 34+ messages in thread

* [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (7 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 08/16] Platform/CelloBoard: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:07   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
                   ` (8 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 .../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 909cfb5507..24f221a022 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -28,6 +28,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
@@ -410,28 +415,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 5309a77c1a..10c5307ebf 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -215,28 +215,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] 34+ messages in thread

* [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (8 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:10   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: " Zhang, Shenglei
                   ` (7 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 .../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 8dbf836f7e..9961c91141 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -28,6 +28,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
 
@@ -55,11 +61,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
@@ -119,9 +120,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
 
@@ -600,25 +598,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 1e07f579a8..cafa2083bf 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -192,25 +192,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.dsc.inc
+
   INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
 
   #
-- 
2.18.0.windows.1


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (9 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:11   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
                   ` (6 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 .../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 cc4f2facd0..3dc805921c 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -29,6 +29,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.
@@ -75,11 +83,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
@@ -572,23 +575,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 fa814880e0..6d7cfb3933 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -185,21 +185,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] 34+ messages in thread

* [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (10 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:18   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF " Zhang, Shenglei
                   ` (5 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++++++------------
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +--------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0cf5d8447a..cff00fca50 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
@@ -692,3 +676,11 @@
   DEFINE UTMI_USB_HOST0     = 0x0
   DEFINE UTMI_USB_HOST1     = 0x1
   DEFINE UTMI_USB_DEVICE0   = 0x2
+
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE             = FALSE
+  DEFINE NETWORK_TLS_ENABLE             = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE           = FALSE
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index 8a050ef987..01a5ea3bed 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -135,17 +135,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] 34+ messages in thread

* [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (11 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:25   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:56 ` [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC " Zhang, Shenglei
                   ` (4 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 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 b163dab5c3..93ea18ba18 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -189,17 +189,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] 34+ messages in thread

* [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (12 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF " Zhang, Shenglei
@ 2019-05-15  8:56 ` Zhang, Shenglei
  2019-05-16 20:27   ` [edk2-devel] " Leif Lindholm
  2019-05-15  8:57 ` [PATCH edk2-platforms 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
                   ` (3 subsequent siblings)
  17 siblings, 1 reply; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:56 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>
---
 Platform/Comcast/RDKQemu/RDKQemu.dsc | 36 +++++++++-------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index f22f14aed9..ef4b1632ec 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -33,8 +33,15 @@
   # Defines for default states.  These can be changed on the command line.
   # -D FLAG=VALUE
   #
-  DEFINE SECURE_BOOT_ENABLE      = TRUE
-  DEFINE HTTP_BOOT_ENABLE        = TRUE
+  DEFINE SECURE_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
 
@@ -345,29 +352,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] 34+ messages in thread

* [PATCH edk2-platforms 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (13 preceding siblings ...)
  2019-05-15  8:56 ` [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC " Zhang, Shenglei
@ 2019-05-15  8:57 ` Zhang, Shenglei
  2019-05-15  8:57 ` [PATCH edk2-platforms 16/16] Platform/PurleyOpenBoardPkg: " Zhang, Shenglei
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:57 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>
---
 .../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 b9faf558b7..cea50d486c 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 2324794841..cf8de3493d 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 10d44d5652..363d72990e 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] 34+ messages in thread

* [PATCH edk2-platforms 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (14 preceding siblings ...)
  2019-05-15  8:57 ` [PATCH edk2-platforms 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
@ 2019-05-15  8:57 ` Zhang, Shenglei
  2019-05-15 12:29 ` [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Liming Gao
  2019-05-16 20:30 ` Leif Lindholm
  17 siblings, 0 replies; 34+ messages in thread
From: Zhang, Shenglei @ 2019-05-15  8:57 UTC (permalink / raw)
  To: devel; +Cc: Michael A Kubacki, Jiewen Yao

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.And add network related definition in
Purley PlatformPkg.dsc.

Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 .../Include/Dsc/CoreAdvancedDxeInclude.dsc    | 26 +------------------
 .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +------------------
 .../Include/Dsc/CoreCommonLib.dsc             | 11 ++++----
 .../BoardMtOlympus/PlatformPkg.dsc            |  6 +++++
 4 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index 6764d46131..0c44c52582 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -17,31 +17,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 64f1dd5872..97706f7805 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -17,31 +17,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
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index dd0173a1af..e8f4760395 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -78,11 +78,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
 
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index ded1201a86..c549936299 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -36,6 +36,12 @@
   BUILD_TARGETS                       = DEBUG|RELEASE
   SKUID_IDENTIFIER                    = DEFAULT
 
+  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
+	DEFINE NETWORK_TLS_ENABLE			  = FALSE
+  !else
+	DEFINE NETWORK_ENABLE				  = FALSE
+  !endif
+
   #
   # Set the global variables
   #
-- 
2.18.0.windows.1


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (15 preceding siblings ...)
  2019-05-15  8:57 ` [PATCH edk2-platforms 16/16] Platform/PurleyOpenBoardPkg: " Zhang, Shenglei
@ 2019-05-15 12:29 ` Liming Gao
  2019-05-16 20:30 ` Leif Lindholm
  17 siblings, 0 replies; 34+ messages in thread
From: Liming Gao @ 2019-05-15 12:29 UTC (permalink / raw)
  To: devel@edk2.groups.io, Zhang, Shenglei
  Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org,
	Kinney, Michael D, Kubacki, Michael A, Sun, Zailiang

Cc edk2-platform maintainers. 

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Zhang, Shenglei
> Sent: Wednesday, May 15, 2019 4:57 PM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF
> 
> 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.
> 
> Shenglei Zhang (16):
>   Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment
>     file.
>   Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment
>     file.
>   Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
>   Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment
>     file.
>   Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's
>     fragment file.
> 
>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     | 29 +---------
>  .../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          | 36 ++++--------
>  Platform/Hisilicon/D03/D03.dsc                | 26 ++++-----
>  Platform/Hisilicon/D03/D03.fdf                | 10 +---
>  Platform/Hisilicon/D05/D05.dsc                | 56 ++++++-------------
>  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            |  6 ++
>  .../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 +----
>  .../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 +-----
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++------
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +---
>  36 files changed, 178 insertions(+), 696 deletions(-)
> 
> --
> 2.18.0.windows.1
> 
> 
> 


^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
@ 2019-05-16 15:32   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 15:32 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:46PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     | 29 +------------------
>  .../AMD/OverdriveBoard/OverdriveBoard.fdf     | 23 +--------------
>  2 files changed, 2 insertions(+), 50 deletions(-)
> 
> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> index 39b5dad154..b85b7aa03e 100644
> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> @@ -78,12 +78,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
> -

I believe this should also delete (further down):
  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
and
  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

With those deletions added:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

/
    Leif

>    # ARM Architectural Libraries
>    CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
>    DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
> @@ -641,28 +635,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 2aaf83084e..49af46cd16 100644
> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
> @@ -193,28 +193,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
@ 2019-05-16 16:24   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 16:24 UTC (permalink / raw)
  To: devel, shenglei.zhang

On Wed, May 15, 2019 at 04:56:47PM +0800, Zhang, Shenglei wrote:
> 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>

This looks to me like it translates the existing configuration
accurately.
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 b647f65ad1..887b8dd72d 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> @@ -14,17 +14,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 e7a77c0ad9..7e10f62ca1 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> @@ -15,6 +15,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
>  
> @@ -60,12 +68,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
> @@ -415,17 +417,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 03/16] Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 03/16] Hisilicon/D03: " Zhang, Shenglei
@ 2019-05-16 16:41   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 16:41 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:48PM +0800, Zhang, Shenglei wrote:
> 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 07ff461277..d98997c59e 100644
> --- a/Platform/Hisilicon/D03/D03.dsc
> +++ b/Platform/Hisilicon/D03/D03.dsc
> @@ -29,6 +29,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]
> @@ -40,13 +50,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)
> @@ -404,16 +409,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 3f07b2e577..fc8a2945ea 100644
> --- a/Platform/Hisilicon/D03/D03.fdf
> +++ b/Platform/Hisilicon/D03/D03.fdf
> @@ -246,15 +246,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 04/16] Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 04/16] Hisilicon/D05: " Zhang, Shenglei
@ 2019-05-16 16:57   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 16:57 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:49PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  Platform/Hisilicon/D05/D05.dsc | 56 +++++++++++-----------------------
>  Platform/Hisilicon/D05/D05.fdf | 23 +-------------
>  2 files changed, 19 insertions(+), 60 deletions(-)
> 
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index 70b044c7e3..878ab5adf6 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -29,8 +29,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
>  
> @@ -43,12 +50,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
> @@ -58,7 +61,7 @@
>  
>    TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
>  
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> +!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
>    HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
>  !endif
>  
> @@ -95,10 +98,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

These changes appear unrelated.

>  
>  [LibraryClasses.common.SEC]
>    ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> @@ -136,7 +139,7 @@
>  
>  [PcdsFixedAtBuild.common]
>    gArmPlatformTokenSpaceGuid.PcdCoreCount|8
> -  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> +  gArmTokenSpaceGuid.PcdPciIoTranslation|0

This one too.

>  
>    gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
>  
> @@ -472,7 +475,7 @@
>    ArmPkg/Drivers/CpuDxe/CpuDxe.inf
>    MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>  
> -  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
> +  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf

And this.

>    Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf
>  
>    Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf
> @@ -538,30 +541,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
> @@ -608,10 +588,10 @@
>      <LibraryClasses>
>        NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
>    }
> -  Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {
> +  Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {

And this?

>      <LibraryClasses>
> -      NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> -  }
> +      NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> +  }

And this?

Please resolve the unrelated issues.

/
    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 9632aea4b0..21e04ce9a8 100644
> --- a/Platform/Hisilicon/D05/D05.fdf
> +++ b/Platform/Hisilicon/D05/D05.fdf
> @@ -252,28 +252,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] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 05/16] Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 05/16] Hisilicon/D06: " Zhang, Shenglei
@ 2019-05-16 17:02   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 17:02 UTC (permalink / raw)
  To: devel, shenglei.zhang

On Wed, May 15, 2019 at 04:56:50PM +0800, Zhang, Shenglei wrote:
> 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 73bea728b0..e6cd975255 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -28,8 +28,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
>  
> @@ -42,12 +48,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
> @@ -55,9 +57,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
>  
> @@ -346,30 +347,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 e402628a1b..fda896097a 100644
> --- a/Platform/Hisilicon/D06/D06.fdf
> +++ b/Platform/Hisilicon/D06/D06.fdf
> @@ -245,32 +245,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 06/16] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 06/16] Hisilicon/HiKey: " Zhang, Shenglei
@ 2019-05-16 19:23   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 19:23 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:51PM +0800, Zhang, Shenglei wrote:
> 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 7e05babb6c..2081e95b06 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.dsc
> +++ b/Platform/Hisilicon/HiKey/HiKey.dsc
> @@ -28,6 +28,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]
> @@ -53,12 +62,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
> @@ -245,16 +248,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 7e6c8083bb..aadbfc0075 100644
> --- a/Platform/Hisilicon/HiKey/HiKey.fdf
> +++ b/Platform/Hisilicon/HiKey/HiKey.fdf
> @@ -159,15 +159,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: " Zhang, Shenglei
@ 2019-05-16 19:23   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 19:23 UTC (permalink / raw)
  To: devel, shenglei.zhang

On Wed, May 15, 2019 at 04:56:52PM +0800, Zhang, Shenglei wrote:
> 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 a4a1a371de..f127159138 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> @@ -28,6 +28,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]
> @@ -54,11 +63,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
> @@ -229,16 +233,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 1b07284dc8..def66d41d4 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> @@ -153,16 +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
>    #
>    # FAT filesystem + GPT/MBR partitioning
>    #
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 08/16] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 08/16] Platform/CelloBoard: " Zhang, Shenglei
@ 2019-05-16 20:06   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:06 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:53PM +0800, Zhang, Shenglei wrote:
> 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 bc2f3e2076..85ef45093a 100644
> --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
> @@ -29,6 +29,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.
> @@ -75,13 +82,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
> @@ -580,19 +580,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 d34b986b93..eae0019a1b 100644
> --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
> +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
> @@ -178,20 +178,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
@ 2019-05-16 20:07   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:07 UTC (permalink / raw)
  To: devel, shenglei.zhang

On Wed, May 15, 2019 at 04:56:54PM +0800, Zhang, Shenglei wrote:
> 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 909cfb5507..24f221a022 100644
> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> @@ -28,6 +28,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
> @@ -410,28 +415,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 5309a77c1a..10c5307ebf 100644
> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
> @@ -215,28 +215,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
@ 2019-05-16 20:10   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:10 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:55PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  .../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 8dbf836f7e..9961c91141 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
> @@ -28,6 +28,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
>  
> @@ -55,11 +61,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
> @@ -119,9 +120,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
>  
> @@ -600,25 +598,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 1e07f579a8..cafa2083bf 100644
> --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
> @@ -192,25 +192,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.dsc.inc

Network.fdf.inc, surely?
Please make sure this mistake has not been copied to other platforms I
have already reviewed.

/
    Leif

> +
>    INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf
>  
>    #
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: " Zhang, Shenglei
@ 2019-05-16 20:11   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:11 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:56PM +0800, Zhang, Shenglei wrote:
> 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 cc4f2facd0..3dc805921c 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> @@ -29,6 +29,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.
> @@ -75,11 +83,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
> @@ -572,23 +575,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 fa814880e0..6d7cfb3933 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
> @@ -185,21 +185,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
@ 2019-05-16 20:18   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:18 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:57PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++++++------------
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +--------
>  2 files changed, 10 insertions(+), 28 deletions(-)
> 
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 0cf5d8447a..cff00fca50 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
> @@ -692,3 +676,11 @@
>    DEFINE UTMI_USB_HOST0     = 0x0
>    DEFINE UTMI_USB_HOST1     = 0x1
>    DEFINE UTMI_USB_DEVICE0   = 0x2
> +
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_IP6_ENABLE             = FALSE
> +  DEFINE NETWORK_TLS_ENABLE             = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE           = FALSE

These should be set in the [Defines] section of each platform that
includes this file:

Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc

(I see no problem with that being done in a single patch, and updated
version of this one. These are different platforms based on the same
silicon.)

/
    Leif

> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 8a050ef987..01a5ea3bed 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -135,17 +135,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] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF " Zhang, Shenglei
@ 2019-05-16 20:25   ` Leif Lindholm
  2019-05-17  6:01     ` Thomas Abraham
  0 siblings, 1 reply; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:25 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel, Thomas Panakamattam Abraham

On Wed, May 15, 2019 at 04:56:58PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  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 b163dab5c3..93ea18ba18 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> @@ -189,17 +189,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

OK, so this is a little bit messy, but that is due to the include of
ArmVExpress.dsc.inc and how all that sticks together.

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

But Thomas, would you mind looking into aligning how the VExpress
config fragments used by various platforms in Platform/ARM interact
with these new NetworkPkg fragments, and try to clean up so the actual
function enabling/disabling happens per-platform?

/
    Leif

>  
>  !ifdef EDK2_ENABLE_SMSC_91X
>    INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment file.
  2019-05-15  8:56 ` [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC " Zhang, Shenglei
@ 2019-05-16 20:27   ` Leif Lindholm
  0 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:27 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

On Wed, May 15, 2019 at 04:56:59PM +0800, Zhang, Shenglei wrote:
> 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>
> ---
>  Platform/Comcast/RDKQemu/RDKQemu.dsc | 36 +++++++++-------------------
>  1 file changed, 11 insertions(+), 25 deletions(-)
> 
> diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> index f22f14aed9..ef4b1632ec 100644
> --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
> +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> @@ -33,8 +33,15 @@
>    # Defines for default states.  These can be changed on the command line.
>    # -D FLAG=VALUE
>    #
> -  DEFINE SECURE_BOOT_ENABLE      = TRUE

This whitespace change seems unnecessary to me.
If you leave this line in the state it was before this patch:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> -  DEFINE HTTP_BOOT_ENABLE        = TRUE
> +  DEFINE SECURE_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
>  
> @@ -345,29 +352,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	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF
  2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
                   ` (16 preceding siblings ...)
  2019-05-15 12:29 ` [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Liming Gao
@ 2019-05-16 20:30 ` Leif Lindholm
  17 siblings, 0 replies; 34+ messages in thread
From: Leif Lindholm @ 2019-05-16 20:30 UTC (permalink / raw)
  To: devel, shenglei.zhang; +Cc: ard.biesheuvel

Hi Shenglei,

I have now reviewed the patches that are mine to review.
Many thanks for this bit of cleanup/standardisation.

I would just like to raise one warning flag:
These patches have been submitted without the Contributed-under tag.
That means the series needs to either be held back until an overall
repository license change happens, or v2 needs to be submitted with
Contributed-under.

Best Regards,

Leif

On Wed, May 15, 2019 at 04:56:45PM +0800, Zhang, Shenglei wrote:
> 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.
> 
> Shenglei Zhang (16):
>   Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment
>     file.
>   Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment
>     file.
>   Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's fragment
>     file.
>   Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include
>     fragment file.
>   Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
>   Platform/RDKQemu: Update DSC to use NetworkPkg's include fragment
>     file.
>   Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's
>     fragment file.
>   Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's
>     fragment file.
> 
>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     | 29 +---------
>  .../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          | 36 ++++--------
>  Platform/Hisilicon/D03/D03.dsc                | 26 ++++-----
>  Platform/Hisilicon/D03/D03.fdf                | 10 +---
>  Platform/Hisilicon/D05/D05.dsc                | 56 ++++++-------------
>  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            |  6 ++
>  .../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 +----
>  .../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 +-----
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++------
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +---
>  36 files changed, 178 insertions(+), 696 deletions(-)
> 
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
  2019-05-16 20:25   ` [edk2-devel] " Leif Lindholm
@ 2019-05-17  6:01     ` Thomas Abraham
  0 siblings, 0 replies; 34+ messages in thread
From: Thomas Abraham @ 2019-05-17  6:01 UTC (permalink / raw)
  To: devel, Leif Lindholm; +Cc: shenglei.zhang, Ard Biesheuvel

On Fri, May 17, 2019 at 1:56 AM Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, May 15, 2019 at 04:56:58PM +0800, Zhang, Shenglei wrote:
> > 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>
> > ---
> >  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 b163dab5c3..93ea18ba18 100644
> > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> > @@ -189,17 +189,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
>
> OK, so this is a little bit messy, but that is due to the include of
> ArmVExpress.dsc.inc and how all that sticks together.
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
> But Thomas, would you mind looking into aligning how the VExpress
> config fragments used by various platforms in Platform/ARM interact
> with these new NetworkPkg fragments, and try to clean up so the actual
> function enabling/disabling happens per-platform?

Sure, I will have a look at this next week.

-Thomas.

>
> /
>     Leif
>
> >
> >  !ifdef EDK2_ENABLE_SMSC_91X
> >    INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> > --
> > 2.18.0.windows.1
> >
> >
> >
> >
>
> 
>

^ permalink raw reply	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2019-05-17  6:02 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-15  8:56 [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
2019-05-15  8:56 ` [PATCH edk2-platforms 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
2019-05-16 15:32   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
2019-05-16 16:24   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 03/16] Hisilicon/D03: " Zhang, Shenglei
2019-05-16 16:41   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 04/16] Hisilicon/D05: " Zhang, Shenglei
2019-05-16 16:57   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 05/16] Hisilicon/D06: " Zhang, Shenglei
2019-05-16 17:02   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 06/16] Hisilicon/HiKey: " Zhang, Shenglei
2019-05-16 19:23   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: " Zhang, Shenglei
2019-05-16 19:23   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 08/16] Platform/CelloBoard: " Zhang, Shenglei
2019-05-16 20:06   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
2019-05-16 20:07   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 10/16] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
2019-05-16 20:10   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: " Zhang, Shenglei
2019-05-16 20:11   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
2019-05-16 20:18   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:56 ` [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF " Zhang, Shenglei
2019-05-16 20:25   ` [edk2-devel] " Leif Lindholm
2019-05-17  6:01     ` Thomas Abraham
2019-05-15  8:56 ` [PATCH edk2-platforms 14/16] Platform/RDKQemu: Update DSC " Zhang, Shenglei
2019-05-16 20:27   ` [edk2-devel] " Leif Lindholm
2019-05-15  8:57 ` [PATCH edk2-platforms 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
2019-05-15  8:57 ` [PATCH edk2-platforms 16/16] Platform/PurleyOpenBoardPkg: " Zhang, Shenglei
2019-05-15 12:29 ` [edk2-devel] [PATCH edk2-platforms 00/16] Add Network's include segment files in DSC/FDF Liming Gao
2019-05-16 20:30 ` Leif Lindholm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox