On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote: > 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.
Version comments go below "---" line. > Cc: Leif Lindholm <leif.lindh...@linaro.org> > Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com> > --- > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ > .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++ Please follow https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers when generating and submitting patches. That way we get to see the whole path of the files being modified. / Leif > 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 d2bbdedcfa..6face86577 100644 > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > @@ -129,17 +129,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 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41122): https://edk2.groups.io/g/devel/message/41122 Mute This Topic: https://groups.io/mt/31682826/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
