From: "Zhang, Shenglei" <shenglei.zhang@intel.com>
To: devel@edk2.groups.io
Subject: [PATCH edk2-platforms V2 08/16] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include fragment file.
Date: Fri, 17 May 2019 15:10:19 +0800 [thread overview]
Message-ID: <20190517071027.24780-9-shenglei.zhang@intel.com> (raw)
In-Reply-To: <20190517071027.24780-1-shenglei.zhang@intel.com>
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
Contributed-under: TianoCore Contribution Agreement 1.1
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
next prev parent reply other threads:[~2019-05-17 7:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 7:10 [PATCH edk2-platforms V2 00/16] Add Network's include segment files in DSC/FDF Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 01/16] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg's fragment file Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 02/16] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 03/16] Hisilicon/D03: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 04/16] Hisilicon/D05: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 05/16] Hisilicon/D06: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 06/16] Hisilicon/HiKey: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 07/16] Hisilicon/HiKey960: " Zhang, Shenglei
2019-05-17 7:10 ` Zhang, Shenglei [this message]
2019-05-17 7:10 ` [PATCH edk2-platforms V2 09/16] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 10/16] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 11/16] Platform/Overdrive1000Board: " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 13/16] Platform/SgiPkg: Update FDF " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 14/16] Platform/RDKQemu: Update DSC " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 15/16] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg's " Zhang, Shenglei
2019-05-17 7:10 ` [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: " Zhang, Shenglei
2019-05-17 7:26 ` Kubacki, Michael A
2019-05-19 12:59 ` [edk2-devel] " 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=20190517071027.24780-9-shenglei.zhang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox