subject:"\[edk2\-devel\] \[PATCH edk2\-platforms 11\/16\] Platform\/Overdrive1000Board\: Update DSC\/FDF to use NetworkPkg's fragment file."

Re: [edk2-devel] [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-16 Thread Leif Lindholm

On Wed, May 15, 2019 at 04:56:56PM +0800, Zhang, Shenglei wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> 
> Signed-off-by: Shenglei Zhang 

Reviewed-by: Leif Lindholm 

> ---
>  .../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++
>  .../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 cc4f2facd0..3dc805921c 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
> @@ -29,6 +29,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.
> @@ -75,11 +83,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
> @@ -572,23 +575,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 {
>  
>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 fa814880e0..6d7cfb3933 100644
> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
> @@ -185,21 +185,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.18.0.windows.1
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40833): https://edk2.groups.io/g/devel/message/40833
Mute This Topic: https://groups.io/mt/31627862/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.

2019-05-15 Thread Zhang, Shenglei

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

Signed-off-by: Shenglei Zhang 
---
 .../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++
 .../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 cc4f2facd0..3dc805921c 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -29,6 +29,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.
@@ -75,11 +83,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
@@ -572,23 +575,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 {
 
   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 fa814880e0..6d7cfb3933 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf
@@ -185,21 +185,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.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40671): https://edk2.groups.io/g/devel/message/40671
Mute This Topic: https://groups.io/mt/31627862/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.

[edk2-devel] [PATCH edk2-platforms 11/16] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg's fragment file.

2 matches

Site Navigation

Mail list logo

Footer information