public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Liming Gao" <liming.gao@intel.com>
To: devel@edk2.groups.io
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
Subject: [Patch edk2-platform V4 11/18] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF
Date: Tue, 21 May 2019 21:36:16 +0800	[thread overview]
Message-ID: <20190521133623.20404-12-liming.gao@intel.com> (raw)
In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com>

From: Shenglei Zhang <shenglei.zhang@intel.com>

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 27 +++++++++------------------
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 16 +---------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index d74ad479af..f9b73edeb3 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -23,6 +23,14 @@ DEFINE NUM_CORES    = 4
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_IP6_ENABLE             = FALSE
+  DEFINE NETWORK_TLS_ENABLE             = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
+  DEFINE NETWORK_ISCSI_ENABLE           = FALSE
+
 ################################################################################
 #
 # Library Class section - list of all Library Classes needed by this Platform.
@@ -69,11 +77,6 @@ DEFINE NUM_CORES    = 4
 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
 
   # ARM Architectural Libraries
   CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
@@ -566,23 +569,11 @@ DEFINE NUM_CORES    = 4
   #
   # Networking stack
   #
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+!include NetworkPkg/Network.dsc.inc
   MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf {
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21
   }
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# NetworkPkg/IScsiDxe/IScsiDxe.inf
 
   #
   # Core Info
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
index 6581138a6c..6a9226476b 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -179,21 +179,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
-## Bug https://bugs.linaro.org/show_bug.cgi?id=2239
-# INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
   #
   # Core Info
   #
-- 
2.13.0.windows.1


  parent reply	other threads:[~2019-05-21 13:36 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-21 13:36 [Patch edk2-platform V4 00/18] Add Network's include segment files in DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 02/18] Platform/VExpressPkg: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 03/18] Hisilicon/D03: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 04/18] Hisilicon/D05: " Liming Gao
2019-05-23 16:59   ` [edk2-devel] " Leif Lindholm
2019-05-21 13:36 ` [Patch edk2-platform V4 05/18] Hisilicon/D06: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 06/18] Hisilicon/HiKey: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 07/18] Hisilicon/HiKey960: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 08/18] Platform/CelloBoard: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 09/18] Platform/DeveloperBox: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 10/18] Platform/SynQuacerEvalBoard: " Liming Gao
2019-05-21 13:36 ` Liming Gao [this message]
2019-05-21 13:36 ` [Patch edk2-platform V4 12/18] Silicon/Armada7k8k: " Liming Gao
2019-05-23 17:00   ` Leif Lindholm
2019-05-21 13:36 ` [Patch edk2-platform V4 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 17/18] Platform/MinPlatformPkg: " Liming Gao
2019-05-21 13:36 ` [Patch edk2-platform V4 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Liming Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190521133623.20404-12-liming.gao@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox