From: "Zhang, Shenglei" <shenglei.zhang@intel.com>
To: devel@edk2.groups.io
Subject: [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF
Date: Mon, 20 May 2019 15:07:19 +0800 [thread overview]
Message-ID: <20190520070729.30812-9-shenglei.zhang@intel.com> (raw)
In-Reply-To: <20190520070729.30812-1-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/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++++++---------------
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +-----------
2 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 525276a2b0..67830506ab 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -23,6 +23,13 @@ DEFINE NUM_CORES = 4
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/LeMaker/CelloBoard/CelloBoard.fdf
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+
################################################################################
#
# Library Class section - list of all Library Classes needed by this Platform.
@@ -69,13 +76,6 @@ DEFINE NUM_CORES = 4
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
- # Networking Requirements
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
# ARM Architectural Libraries
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -574,19 +574,7 @@ DEFINE NUM_CORES = 4
#
# Networking stack
#
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- NetworkPkg/TcpDxe/TcpDxe.inf
- NetworkPkg/IScsiDxe/IScsiDxe.inf
+!include NetworkPkg/Network.dsc.inc
#
# Core Info
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index a2098989a0..80c760464f 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -172,20 +172,7 @@ READ_LOCK_STATUS = TRUE
#
# Networking stack
#
- INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
- INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
- INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
- INF NetworkPkg/TcpDxe/TcpDxe.inf
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-
+!include NetworkPkg/Network.fdf.inc
#
# Core Info
#
--
2.18.0.windows.1
next prev parent reply other threads:[~2019-05-20 7:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 7:07 [PATCH edk2-platforms V3 00/18] Add Network's include segment files in DSC/FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 02/18] Platform/VExpressPkg: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 03/18] Hisilicon/D03: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 04/18] Hisilicon/D05: " Zhang, Shenglei
2019-05-21 11:57 ` Leif Lindholm
2019-05-21 13:39 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 05/18] Hisilicon/D06: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: " Zhang, Shenglei
2019-05-20 7:07 ` Zhang, Shenglei [this message]
2019-05-20 7:07 ` [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: " Zhang, Shenglei
2019-05-21 11:59 ` Leif Lindholm
2019-05-21 13:17 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: " Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: " Zhang, Shenglei
2019-05-21 12:04 ` Leif Lindholm
2019-05-21 13:16 ` [edk2-devel] " Liming Gao
2019-05-20 7:07 ` [PATCH edk2-platforms V3 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC Zhang, Shenglei
2019-05-20 7:07 ` [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-21 2:49 ` Sun, Zailiang
2019-05-20 7:07 ` [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Zhang, Shenglei
2019-05-20 20:21 ` Kubacki, Michael A
2019-05-20 7:07 ` [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: " Zhang, Shenglei
2019-05-20 14:55 ` [edk2-devel] " Liming Gao
2019-05-20 20:15 ` Kubacki, Michael A
2019-05-20 7:07 ` [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Zhang, Shenglei
2019-05-20 14:56 ` [edk2-devel] " Liming Gao
2019-05-20 20:23 ` Kubacki, Michael A
2019-05-21 1:50 ` Zhou, Bowen
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=20190520070729.30812-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