[edk2-devel] [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.

Zhang, Shenglei posted 16 patches 6 years, 9 months ago
There is a newer version of this series
[edk2-devel] [PATCH edk2-platforms 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
Posted by Zhang, Shenglei 6 years, 9 months ago
This patch updates the platform FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index b163dab5c3..93ea18ba18 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -189,17 +189,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # Networking stack
   #
-  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/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
 
 !ifdef EDK2_ENABLE_SMSC_91X
   INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
-- 
2.18.0.windows.1


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

View/Reply Online (#40673): https://edk2.groups.io/g/devel/message/40673
Mute This Topic: https://groups.io/mt/31627864/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 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
Posted by Leif Lindholm 6 years, 8 months ago
On Wed, May 15, 2019 at 04:56:58PM +0800, Zhang, Shenglei wrote:
> This patch updates the platform FDF files to use the include fragment
> files provided by NetworkPkg.
> 
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> index b163dab5c3..93ea18ba18 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> @@ -189,17 +189,7 @@ READ_LOCK_STATUS   = TRUE
>    #
>    # Networking stack
>    #
> -  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/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

OK, so this is a little bit messy, but that is due to the include of
ArmVExpress.dsc.inc and how all that sticks together.

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

But Thomas, would you mind looking into aligning how the VExpress
config fragments used by various platforms in Platform/ARM interact
with these new NetworkPkg fragments, and try to clean up so the actual
function enabling/disabling happens per-platform?

/
    Leif

>  
>  !ifdef EDK2_ENABLE_SMSC_91X
>    INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

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

View/Reply Online (#40835): https://edk2.groups.io/g/devel/message/40835
Mute This Topic: https://groups.io/mt/31627864/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 13/16] Platform/SgiPkg: Update FDF to use NetworkPkg's include fragment file.
Posted by Thomas Abraham 6 years, 8 months ago
On Fri, May 17, 2019 at 1:56 AM Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, May 15, 2019 at 04:56:58PM +0800, Zhang, Shenglei wrote:
> > This patch updates the platform FDF files to use the include fragment
> > files provided by NetworkPkg.
> >
> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> > ---
> >  Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +-----------
> >  1 file changed, 1 insertion(+), 11 deletions(-)
> >
> > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> > index b163dab5c3..93ea18ba18 100644
> > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> > @@ -189,17 +189,7 @@ READ_LOCK_STATUS   = TRUE
> >    #
> >    # Networking stack
> >    #
> > -  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/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
>
> OK, so this is a little bit messy, but that is due to the include of
> ArmVExpress.dsc.inc and how all that sticks together.
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
> But Thomas, would you mind looking into aligning how the VExpress
> config fragments used by various platforms in Platform/ARM interact
> with these new NetworkPkg fragments, and try to clean up so the actual
> function enabling/disabling happens per-platform?

Sure, I will have a look at this next week.

-Thomas.

>
> /
>     Leif
>
> >
> >  !ifdef EDK2_ENABLE_SMSC_91X
> >    INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> > --
> > 2.18.0.windows.1
> >
> >
> >
> >
>
> 
>

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

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