From: "Zhang, Shenglei" <shenglei.zhang@intel.com>
To: devel@edk2.groups.io
Subject: [PATCH edk2-platforms V2 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file.
Date: Fri, 17 May 2019 15:10:23 +0800 [thread overview]
Message-ID: <20190517071027.24780-13-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.
v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc,
Armada80x0Db.dsc and Armada80x0McBin.dsc.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++
.../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +-----------------
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +-----------
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 01532b4a00..8ee84902ef 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -46,6 +46,14 @@
FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
index c6510bbbbd..5418ddcaa7 100644
--- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
+++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
@@ -46,6 +46,14 @@
FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index d08013612f..ff9bd5dc8c 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -47,6 +47,14 @@
BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
CAPSULE_ENABLE = TRUE
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+
!include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
[LibraryClasses.common]
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 0cf5d8447a..cfbc172b4f 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
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
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 ` [PATCH edk2-platforms V2 08/16] Platform/CelloBoard: " Zhang, Shenglei
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 ` Zhang, Shenglei [this message]
2019-05-17 7:10 ` [PATCH edk2-platforms V2 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include " 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-13-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