1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH edk2-platforms V2 00/16] Add Network's include segment files in DSC/FDF
  4. View patch

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

Zhang, Shenglei posted 16 patches 6 years, 8 months ago
There is a newer version of this series
[edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.
Posted by Zhang, Shenglei 6 years, 8 months ago 
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.And add network related definition in
Purley PlatformPkg.dsc.

Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
cc: Shifei A Lu <shifei.a.lu@intel.com>
cc: Xiaohu Zhou <bowen.zhou@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 .../Include/Dsc/CoreAdvancedDxeInclude.dsc    | 26 +------------------
 .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +------------------
 .../Include/Dsc/CoreCommonLib.dsc             | 11 ++++----
 .../BoardMtOlympus/PlatformPkg.dsc            |  6 +++++
 4 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
index 6764d46131..0c44c52582 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc
@@ -17,31 +17,7 @@
   #
   # UEFI network modules
   #
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
-  NetworkPkg/DnsDxe/DnsDxe.inf
-  NetworkPkg/HttpDxe/HttpDxe.inf
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
-  NetworkPkg/IScsiDxe/IScsiDxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+  !include NetworkPkg/NetworkComponents.dsc.inc
 
 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
index 64f1dd5872..97706f7805 100644
--- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
+++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf
@@ -17,31 +17,7 @@
 #
 # UEFI network modules
 #
-!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
-INF  NetworkPkg/TcpDxe/TcpDxe.inf
-INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-
-INF  NetworkPkg/DnsDxe/DnsDxe.inf
-INF  NetworkPkg/HttpDxe/HttpDxe.inf
-INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
-INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
-
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-!endif
+!include NetworkPkg/Network.fdf.inc
 
 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index dd0173a1af..e8f4760395 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -78,11 +78,12 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+
+  #
+  # Network libraries
+  #
+!include NetworkPkg/NetworkLibs.dsc.inc
+
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
 
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
index ded1201a86..c549936299 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
@@ -36,6 +36,12 @@
   BUILD_TARGETS                       = DEBUG|RELEASE
   SKUID_IDENTIFIER                    = DEFAULT
 
+  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
+	DEFINE NETWORK_TLS_ENABLE			  = FALSE
+  !else
+	DEFINE NETWORK_ENABLE				  = FALSE
+  !endif
+
   #
   # Set the global variables
   #
-- 
2.18.0.windows.1


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

View/Reply Online (#40886): https://edk2.groups.io/g/devel/message/40886
Mute This Topic: https://groups.io/mt/31652756/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.
Posted by Kubacki, Michael A 6 years, 8 months ago 
This looks like a good improvement.
---
* This is touching three packages though the patch only calls out PurleyOpenBoardPkg.
  * AdvancedFeaturePkg
  * MinPlatformPkg
  * Purley OpenBoardPkg
---
* Copyright years in files modified are not updated.
---
There's some PatchCheck.py errors, please check and fix those.

Thanks,
Michael

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Friday, May 17, 2019 12:10 AM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
> <bowen.zhou@intel.com>
> Subject: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg:
> Update DSC/FDF to use NetworkPkg's fragment file.
> 
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.And add network related definition in Purley
> PlatformPkg.dsc.
> 
> Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> cc: Shifei A Lu <shifei.a.lu@intel.com>
> cc: Xiaohu Zhou <bowen.zhou@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  .../Include/Dsc/CoreAdvancedDxeInclude.dsc    | 26 +------------------
>  .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +------------------
>  .../Include/Dsc/CoreCommonLib.dsc             | 11 ++++----
>  .../BoardMtOlympus/PlatformPkg.dsc            |  6 +++++
>  4 files changed, 14 insertions(+), 55 deletions(-)
> 
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> index 6764d46131..0c44c52582 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> e.dsc
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu
> +++ de.dsc
> @@ -17,31 +17,7 @@
>    #
>    # UEFI network modules
>    #
> -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> -  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> -  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> -  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -
> -  NetworkPkg/DnsDxe/DnsDxe.inf
> -  NetworkPkg/HttpDxe/HttpDxe.inf
> -  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -
> -  NetworkPkg/IScsiDxe/IScsiDxe.inf
> -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -!endif
> +  !include NetworkPkg/NetworkComponents.dsc.inc
> 
>  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
>    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> diff --git
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> index 64f1dd5872..97706f7805 100644
> ---
> a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> e.fdf
> +++
> b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl
> +++ ude.fdf
> @@ -17,31 +17,7 @@
>  #
>  # UEFI network modules
>  #
> -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE -INF
> MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
> -INF  NetworkPkg/TcpDxe/TcpDxe.inf
> -INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> -INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> -INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -
> -INF  NetworkPkg/DnsDxe/DnsDxe.inf
> -INF  NetworkPkg/HttpDxe/HttpDxe.inf
> -INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> -INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -
> -INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
> -INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -!endif
> +!include NetworkPkg/Network.fdf.inc
> 
>  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE  INF
> MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index dd0173a1af..e8f4760395 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -78,11 +78,12 @@
>    #
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> +
> +  #
> +  # Network libraries
> +  #
> +!include NetworkPkg/NetworkLibs.dsc.inc
> +
> 
> OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibN
> ull/OemHookStatusCodeLibNull.inf
> 
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in
> f
> 
> diff --git
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> index ded1201a86..c549936299 100644
> ---
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> +++
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> @@ -36,6 +36,12 @@
>    BUILD_TARGETS                       = DEBUG|RELEASE
>    SKUID_IDENTIFIER                    = DEFAULT
> 
> +  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> +	DEFINE NETWORK_TLS_ENABLE			  = FALSE
> +  !else
> +	DEFINE NETWORK_ENABLE				  = FALSE
> +  !endif
> +
>    #
>    # Set the global variables
>    #
> --
> 2.18.0.windows.1


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

View/Reply Online (#40887): https://edk2.groups.io/g/devel/message/40887
Mute This Topic: https://groups.io/mt/31652756/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file.
Posted by Liming Gao 6 years, 8 months ago 
For the change in Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc, 
Need !include NetworkPkg/NetworkDefines.dsc.inc

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Kubacki, Michael A
> Sent: Friday, May 17, 2019 3:26 PM
> To: Zhang, Shenglei <shenglei.zhang@intel.com>; devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen <bowen.zhou@intel.com>
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's
> fragment file.
> 
> This looks like a good improvement.
> ---
> * This is touching three packages though the patch only calls out PurleyOpenBoardPkg.
>   * AdvancedFeaturePkg
>   * MinPlatformPkg
>   * Purley OpenBoardPkg
> ---
> * Copyright years in files modified are not updated.
> ---
> There's some PatchCheck.py errors, please check and fix those.
> 
> Thanks,
> Michael
> 
> > -----Original Message-----
> > From: Zhang, Shenglei
> > Sent: Friday, May 17, 2019 12:10 AM
> > To: devel@edk2.groups.io
> > Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Yao, Jiewen
> > <jiewen.yao@intel.com>; Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
> > <bowen.zhou@intel.com>
> > Subject: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg:
> > Update DSC/FDF to use NetworkPkg's fragment file.
> >
> > This patch updates the platform DSC/FDF files to use the include fragment
> > files provided by NetworkPkg.And add network related definition in Purley
> > PlatformPkg.dsc.
> >
> > Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > cc: Shifei A Lu <shifei.a.lu@intel.com>
> > cc: Xiaohu Zhou <bowen.zhou@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> > ---
> >  .../Include/Dsc/CoreAdvancedDxeInclude.dsc    | 26 +------------------
> >  .../Include/Fdf/CoreAdvancedLateInclude.fdf   | 26 +------------------
> >  .../Include/Dsc/CoreCommonLib.dsc             | 11 ++++----
> >  .../BoardMtOlympus/PlatformPkg.dsc            |  6 +++++
> >  4 files changed, 14 insertions(+), 55 deletions(-)
> >
> > diff --git
> > a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> > e.dsc
> > b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> > e.dsc
> > index 6764d46131..0c44c52582 100644
> > ---
> > a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud
> > e.dsc
> > +++
> > b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu
> > +++ de.dsc
> > @@ -17,31 +17,7 @@
> >    #
> >    # UEFI network modules
> >    #
> > -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> > -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
> > -  NetworkPkg/TcpDxe/TcpDxe.inf
> > -  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > -  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > -  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -
> > -  NetworkPkg/DnsDxe/DnsDxe.inf
> > -  NetworkPkg/HttpDxe/HttpDxe.inf
> > -  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > -  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -
> > -  NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > -!endif
> > +  !include NetworkPkg/NetworkComponents.dsc.inc
> >
> >  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
> >    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> > diff --git
> > a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> > e.fdf
> > b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> > e.fdf
> > index 64f1dd5872..97706f7805 100644
> > ---
> > a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud
> > e.fdf
> > +++
> > b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl
> > +++ ude.fdf
> > @@ -17,31 +17,7 @@
> >  #
> >  # UEFI network modules
> >  #
> > -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE -INF
> > MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> > -INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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/Ip6Dxe/Ip6Dxe.inf
> > -INF  NetworkPkg/TcpDxe/TcpDxe.inf
> > -INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > -INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > -INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -
> > -INF  NetworkPkg/DnsDxe/DnsDxe.inf
> > -INF  NetworkPkg/HttpDxe/HttpDxe.inf
> > -INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> > -INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> > -
> > -INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
> > -INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> > -!endif
> > +!include NetworkPkg/Network.fdf.inc
> >
> >  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE  INF
> > MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> > b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> > index dd0173a1af..e8f4760395 100644
> > --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> > +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> > @@ -78,11 +78,12 @@
> >    #
> >    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> >    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> > -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> > -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> > +
> > +  #
> > +  # Network libraries
> > +  #
> > +!include NetworkPkg/NetworkLibs.dsc.inc
> > +
> >
> > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibN
> > ull/OemHookStatusCodeLibNull.inf
> >
> > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in
> > f
> >
> > diff --git
> > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> > index ded1201a86..c549936299 100644
> > ---
> > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> > +++
> > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc
> > @@ -36,6 +36,12 @@
> >    BUILD_TARGETS                       = DEBUG|RELEASE
> >    SKUID_IDENTIFIER                    = DEFAULT
> >
> > +  !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == TRUE
> > +	DEFINE NETWORK_TLS_ENABLE			  = FALSE
> > +  !else
> > +	DEFINE NETWORK_ENABLE				  = FALSE
> > +  !endif
> > +
> >    #
> >    # Set the global variables
> >    #
> > --
> > 2.18.0.windows.1
> 
> 
> 


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

View/Reply Online (#40982): https://edk2.groups.io/g/devel/message/40982
Mute This Topic: https://groups.io/mt/31652756/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.