[edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[Liming Gao]

1. Remove unnecessary Network libs, because NetworkPkg segment DSC/FDF have included them.
2. Update Update RPi3 DSC/FDF to refer to Network package segment files

These changes are required, because Network modules have been moved into NetworkPkg.

Liming Gao (7):
  BeagleBoardPkg: Update BeagleBoardPkg.dsc to remove unnecessary
    Network libs
  RDKQemu: Update RDKQemu.dsc to remove unnecessary Network libs
  Hisilicon: Update D06.dsc to remove unnecessary Network libs
  QuarkPlatform: Update Quark dsc to remove unnecessary Network libs
  Vlv2TbltDevicePkg: Update Platform dsc to remove unnecessary Network
    libs
  RaspberryPi: Update RPi3 DSC/FDF to refer to Network package segment
    files
  SoftIron: Update Overdrive1000Board.dsc to refer to new Network module
    path

 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc      |  2 +-
 Platform/Comcast/RDKQemu/RDKQemu.dsc                        |  5 +----
 Platform/Hisilicon/D06/D06.dsc                              |  5 -----
 Platform/Intel/QuarkPlatformPkg/Quark.dsc                   |  4 ----
 Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc                |  4 ----
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc      |  2 --
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc        |  4 ----
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc         |  2 --
 Platform/RaspberryPi/RPi3/RPi3.dsc                          | 30 ++++++++++++++----------------
 Platform/RaspberryPi/RPi3/RPi3.fdf                          | 11 +----------
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc |  2 +-
 11 files changed, 18 insertions(+), 53 deletions(-)

-- 
2.13.0.windows.1

[edk2-platform patch 1/7] BeagleBoardPkg: Update BeagleBoardPkg.dsc to remove unnecessary Network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index 2d5d6f9977..7c7762e3ec 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -116,7 +116,7 @@
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
   DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  !include NetworkPkg/NetworkLibs.dsc.inc
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
 
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
-- 
2.13.0.windows.1

[edk2-platform patch 2/7] RDKQemu: Update RDKQemu.dsc to remove unnecessary Network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Comcast/RDKQemu/RDKQemu.dsc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 64b6699ae7..e73a907891 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -33,7 +33,7 @@
   # Network definition
   #
   DEFINE NETWORK_SNP_ENABLE             = FALSE
-  DEFINE NETWORK_TLS_ENABLE             = FALSE
+  DEFINE NETWORK_TLS_ENABLE             = TRUE
   DEFINE NETWORK_IP6_ENABLE             = FALSE
   DEFINE NETWORK_HTTP_BOOT_ENABLE       = TRUE
 
@@ -65,9 +65,6 @@
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
-!if $(HTTP_BOOT_ENABLE) == TRUE
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
 
 [LibraryClasses.common.PEIM]
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
-- 
2.13.0.windows.1

[edk2-platform patch 3/7] Hisilicon: Update D06.dsc to remove unnecessary Network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D06/D06.dsc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 269515c7a5..26b79adba0 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -51,11 +51,6 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
-
-!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-!endif
-
   CpldIoLib|Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf
 
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
-- 
2.13.0.windows.1

[edk2-platform patch 4/7] QuarkPlatform: Update Quark dsc to remove unnecessary Network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
---
 Platform/Intel/QuarkPlatformPkg/Quark.dsc    | 4 ----
 Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc
index a76d3f9356..f251ff4a7f 100644
--- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc
+++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc
@@ -130,10 +130,6 @@
   S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
   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
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
index 520c006c9e..b0a2b841d7 100644
--- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
+++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
@@ -118,10 +118,6 @@
   S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
   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
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-- 
2.13.0.windows.1

[edk2-platform patch 5/7] Vlv2TbltDevicePkg: Update Platform dsc to remove unnecessary Network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 --
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 4 ----
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 2 --
 3 files changed, 8 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index b9c4739e09..9df74c6620 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -145,8 +145,6 @@
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   #
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index c0ae9c02af..f07b6293fd 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -143,8 +143,6 @@
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   #
@@ -1443,8 +1441,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   !endif
 !endif
 
-!endif
-
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 0cb1bb9a9c..cddd580a96 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -145,8 +145,6 @@
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   #
-- 
2.13.0.windows.1

[edk2-platform patch 6/7] RaspberryPi: Update RPi3 DSC/FDF to refer to Network package segment files

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/RaspberryPi/RPi3/RPi3.dsc | 30 ++++++++++++++----------------
 Platform/RaspberryPi/RPi3/RPi3.fdf | 11 +----------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 53b87ba4e5..53995c2e37 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -32,6 +32,19 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F
 
+  #
+  # Network setting
+  #
+  DEFINE NETWORK_ENABLE                 = TRUE
+  DEFINE NETWORK_SNP_ENABLE             = FALSE
+  DEFINE NETWORK_IP4_ENABLE             = TRUE
+  DEFINE NETWORK_IP6_ENABLE             = FALSE
+  DEFINE NETWORK_TLS_ENABLE             = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE           = FALSE
+  DEFINE NETWORK_VLAN_ENABLE            = FALSE
+
 ################################################################################
 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -85,12 +98,6 @@
   # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below
   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
-
   #
   # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
   # This library provides the instrinsic functions such a compiler may generate calls to.
@@ -583,16 +590,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
+  !include NetworkPkg/Network.dsc.inc
 
   #
   # RNG
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index cf4b99a5e9..c3df00198c 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -260,16 +260,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
+  !include NetworkPkg/Network.fdf.inc
 
   #
   # RNG
-- 
2.13.0.windows.1

[edk2-platform patch 7/7] SoftIron: Update Overdrive1000Board.dsc to refer to new Network module path

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index f9b73edeb3..e1e63477ff 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -570,7 +570,7 @@ DEFINE NUM_CORES    = 4
   # Networking stack
   #
 !include NetworkPkg/Network.dsc.inc
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
+  NetworkPkg/MnpDxe/MnpDxe.inf {
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
   }
-- 
2.13.0.windows.1

Re: [edk2-devel] [edk2-platform patch 5/7] Vlv2TbltDevicePkg: Update Platform dsc to remove unnecessary Network libs

[Sun, Zailiang]

Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Liming Gao
> Sent: Tuesday, May 28, 2019 5:59 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
> Subject: [edk2-devel] [edk2-platform patch 5/7] Vlv2TbltDevicePkg: Update
> Platform dsc to remove unnecessary Network libs
> 
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> ---
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 --
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 4 ----
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 2 --
>  3 files changed, 8 deletions(-)
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index b9c4739e09..9df74c6620 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -145,8 +145,6 @@
> 
> BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupp
> ortLib.inf
>    SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> 
> PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformB
> dsLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> 
> FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDevice
> Lib.inf
> 
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
> tManagerLib.inf
>    #
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index c0ae9c02af..f07b6293fd 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -143,8 +143,6 @@
> 
> BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupp
> ortLib.inf
>    SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> 
> PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformB
> dsLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> 
> FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDevice
> Lib.inf
> 
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
> tManagerLib.inf
>    #
> @@ -1443,8 +1441,6 @@
> $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT
> PMInitPeim.inf
>    !endif
>  !endif
> 
> -!endif
> -
>  !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
>    MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
>    MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 0cb1bb9a9c..cddd580a96 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -145,8 +145,6 @@
> 
> BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupp
> ortLib.inf
>    SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> 
> PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformB
> dsLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> 
> FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDevice
> Lib.inf
> 
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
> tManagerLib.inf
>    #
> --
> 2.13.0.windows.1
> 
> 
> 

Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[Ard Biesheuvel]

On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
>
> 1. Remove unnecessary Network libs, because NetworkPkg segment DSC/FDF have included them.
> 2. Update Update RPi3 DSC/FDF to refer to Network package segment files
>
> These changes are required, because Network modules have been moved into NetworkPkg.
>

Am I understanding correctly that all platforms below are now broken
due to the NetworkPkg changes?


> Liming Gao (7):
>   BeagleBoardPkg: Update BeagleBoardPkg.dsc to remove unnecessary
>     Network libs
>   RDKQemu: Update RDKQemu.dsc to remove unnecessary Network libs
>   Hisilicon: Update D06.dsc to remove unnecessary Network libs
>   QuarkPlatform: Update Quark dsc to remove unnecessary Network libs
>   Vlv2TbltDevicePkg: Update Platform dsc to remove unnecessary Network
>     libs
>   RaspberryPi: Update RPi3 DSC/FDF to refer to Network package segment
>     files
>   SoftIron: Update Overdrive1000Board.dsc to refer to new Network module
>     path
>
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc      |  2 +-
>  Platform/Comcast/RDKQemu/RDKQemu.dsc                        |  5 +----
>  Platform/Hisilicon/D06/D06.dsc                              |  5 -----
>  Platform/Intel/QuarkPlatformPkg/Quark.dsc                   |  4 ----
>  Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc                |  4 ----
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc      |  2 --
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc        |  4 ----
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc         |  2 --
>  Platform/RaspberryPi/RPi3/RPi3.dsc                          | 30 ++++++++++++++----------------
>  Platform/RaspberryPi/RPi3/RPi3.fdf                          | 11 +----------
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc |  2 +-
>  11 files changed, 18 insertions(+), 53 deletions(-)
>
> --
> 2.13.0.windows.1
>
>
> 
>

Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[Liming Gao]

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Tuesday, May 28, 2019 6:06 PM
> To: edk2-devel-groups-io <devel@edk2.groups.io>; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif.lindholm@linaro.org>
> Subject: Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg
> 
> On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
> >
> > 1. Remove unnecessary Network libs, because NetworkPkg segment DSC/FDF have included them.
> > 2. Update Update RPi3 DSC/FDF to refer to Network package segment files
> >
> > These changes are required, because Network modules have been moved into NetworkPkg.
> >
> 
> Am I understanding correctly that all platforms below are now broken
> due to the NetworkPkg changes?
> 
Right. Before the change, I send the patch to update platform DSC/FDF to refer to Network segment files, 
these platform DSC/FDF should not be impacted by Network module movement. 

After push Network module movement, I find I miss some cases in platform DSC/FDF.
So, I send this patch set to clean up the remaining issues. Sorry for the platform break. 

> 
> > Liming Gao (7):
> >   BeagleBoardPkg: Update BeagleBoardPkg.dsc to remove unnecessary
> >     Network libs
> >   RDKQemu: Update RDKQemu.dsc to remove unnecessary Network libs
> >   Hisilicon: Update D06.dsc to remove unnecessary Network libs
> >   QuarkPlatform: Update Quark dsc to remove unnecessary Network libs
> >   Vlv2TbltDevicePkg: Update Platform dsc to remove unnecessary Network
> >     libs
> >   RaspberryPi: Update RPi3 DSC/FDF to refer to Network package segment
> >     files
> >   SoftIron: Update Overdrive1000Board.dsc to refer to new Network module
> >     path
> >
> >  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc      |  2 +-
> >  Platform/Comcast/RDKQemu/RDKQemu.dsc                        |  5 +----
> >  Platform/Hisilicon/D06/D06.dsc                              |  5 -----
> >  Platform/Intel/QuarkPlatformPkg/Quark.dsc                   |  4 ----
> >  Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc                |  4 ----
> >  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc      |  2 --
> >  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc        |  4 ----
> >  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc         |  2 --
> >  Platform/RaspberryPi/RPi3/RPi3.dsc                          | 30 ++++++++++++++----------------
> >  Platform/RaspberryPi/RPi3/RPi3.fdf                          | 11 +----------
> >  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc |  2 +-
> >  11 files changed, 18 insertions(+), 53 deletions(-)
> >
> > --
> > 2.13.0.windows.1
> >
> >
> > 
> >

Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[Ard Biesheuvel]

On Tue, 28 May 2019 at 13:03, Gao, Liming <liming.gao@intel.com> wrote:
>
> > -----Original Message-----
> > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> > Sent: Tuesday, May 28, 2019 6:06 PM
> > To: edk2-devel-groups-io <devel@edk2.groups.io>; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif.lindholm@linaro.org>
> > Subject: Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg
> >
> > On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
> > >
> > > 1. Remove unnecessary Network libs, because NetworkPkg segment DSC/FDF have included them.
> > > 2. Update Update RPi3 DSC/FDF to refer to Network package segment files
> > >
> > > These changes are required, because Network modules have been moved into NetworkPkg.
> > >
> >
> > Am I understanding correctly that all platforms below are now broken
> > due to the NetworkPkg changes?
> >
> Right. Before the change, I send the patch to update platform DSC/FDF to refer to Network segment files,
> these platform DSC/FDF should not be impacted by Network module movement.
>
> After push Network module movement, I find I miss some cases in platform DSC/FDF.
> So, I send this patch set to clean up the remaining issues. Sorry for the platform break.
>

Core edk2 is broken as well:

https://ci.linaro.org/job/leg-virt-tianocore-edk2-upstream/3562/console

Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg

[Liming Gao]

Ard:
> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Tuesday, May 28, 2019 7:12 PM
> To: Gao, Liming <liming.gao@intel.com>
> Cc: edk2-devel-groups-io <devel@edk2.groups.io>; Kinney, Michael D <michael.d.kinney@intel.com>; Laszlo Ersek <lersek@redhat.com>;
> Leif Lindholm <leif.lindholm@linaro.org>
> Subject: Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg
> 
> On Tue, 28 May 2019 at 13:03, Gao, Liming <liming.gao@intel.com> wrote:
> >
> > > -----Original Message-----
> > > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> > > Sent: Tuesday, May 28, 2019 6:06 PM
> > > To: edk2-devel-groups-io <devel@edk2.groups.io>; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D
> > > <michael.d.kinney@intel.com>; Laszlo Ersek <lersek@redhat.com>; Leif Lindholm <leif.lindholm@linaro.org>
> > > Subject: Re: [edk2-devel] [edk2-platform patch 0/7] Clean up Platform DSC/FDF to refer to NetworkPkg
> > >
> > > On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
> > > >
> > > > 1. Remove unnecessary Network libs, because NetworkPkg segment DSC/FDF have included them.
> > > > 2. Update Update RPi3 DSC/FDF to refer to Network package segment files
> > > >
> > > > These changes are required, because Network modules have been moved into NetworkPkg.
> > > >
> > >
> > > Am I understanding correctly that all platforms below are now broken
> > > due to the NetworkPkg changes?
> > >
> > Right. Before the change, I send the patch to update platform DSC/FDF to refer to Network segment files,
> > these platform DSC/FDF should not be impacted by Network module movement.
> >
> > After push Network module movement, I find I miss some cases in platform DSC/FDF.
> > So, I send this patch set to clean up the remaining issues. Sorry for the platform break.
> >
> 
> Core edk2 is broken as well:
> 
> https://ci.linaro.org/job/leg-virt-tianocore-edk2-upstream/3562/console

Thanks for your note. I scan DSC/FDF again in edk2, and find three missing cases. 
The patches have been sent for review. 

Re: [edk2-platform patch 1/7] BeagleBoardPkg: Update BeagleBoardPkg.dsc to remove unnecessary Network libs

[Ard Biesheuvel]

On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>

Beagle is completely broken at the moment, so I will propose some
patches to fix it.

> ---
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> index 2d5d6f9977..7c7762e3ec 100644
> --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
> @@ -116,7 +116,7 @@
>    DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>    DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf
>
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> +  !include NetworkPkg/NetworkLibs.dsc.inc

The Shell is the only user of NetLib on this platforms, so I prefer to
add a reference to NetworkPkg's DxeNetlib locally, to the
<LibraryClasses> section of the Shell .inf.

I will follow up myself - no need to resend.

>    FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
>
>    UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> --
> 2.13.0.windows.1
>

Re: [edk2-devel] [edk2-platform patch 2/7] RDKQemu: Update RDKQemu.dsc to remove unnecessary Network libs

[Ard Biesheuvel]

On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>

This still does not build. It has lots of other errors, but with those
fixes, we still need to set NETWORK_ALLOW_HTTP_CONNECTIONS to TRUE to
retain the old behavior.

I will follow up with a patch that fixes this platform, no need to resend.


> ---
>  Platform/Comcast/RDKQemu/RDKQemu.dsc | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> index 64b6699ae7..e73a907891 100644
> --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
> +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
> @@ -33,7 +33,7 @@
>    # Network definition
>    #
>    DEFINE NETWORK_SNP_ENABLE             = FALSE
> -  DEFINE NETWORK_TLS_ENABLE             = FALSE
> +  DEFINE NETWORK_TLS_ENABLE             = TRUE
>    DEFINE NETWORK_IP6_ENABLE             = FALSE
>    DEFINE NETWORK_HTTP_BOOT_ENABLE       = TRUE
>
> @@ -65,9 +65,6 @@
>    PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
>    PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
>    RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> -!endif
>
>  [LibraryClasses.common.PEIM]
>    ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
> --
> 2.13.0.windows.1
>
>
> 
>

Re: [edk2-platform patch 7/7] SoftIron: Update Overdrive1000Board.dsc to refer to new Network module path

[Ard Biesheuvel]

On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as bad520a07e54..95721f831f6c

> ---
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> index f9b73edeb3..e1e63477ff 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> @@ -570,7 +570,7 @@ DEFINE NUM_CORES    = 4
>    # Networking stack
>    #
>  !include NetworkPkg/Network.dsc.inc
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
> +  NetworkPkg/MnpDxe/MnpDxe.inf {
>      <PcdsFixedAtBuild>
>        gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
>    }
> --
> 2.13.0.windows.1
>

Re: [edk2-platform patch 3/7] Hisilicon: Update D06.dsc to remove unnecessary Network libs

[Ard Biesheuvel]

On Tue, 28 May 2019 at 12:00, Liming Gao <liming.gao@intel.com> wrote:
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>  Platform/Hisilicon/D06/D06.dsc | 5 -----
>  1 file changed, 5 deletions(-)
>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as 95721f831f6c..5752f09f7e72


> diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
> index 269515c7a5..26b79adba0 100644
> --- a/Platform/Hisilicon/D06/D06.dsc
> +++ b/Platform/Hisilicon/D06/D06.dsc
> @@ -51,11 +51,6 @@
>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>
> -
> -!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE
> -  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> -!endif
> -
>    CpldIoLib|Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf
>
>    TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
> --
> 2.13.0.windows.1
>