From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: liming.gao@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Tue, 21 May 2019 06:16:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:16:22 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga006.fm.intel.com with ESMTP; 21 May 2019 06:16:22 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 21 May 2019 06:16:22 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 21 May 2019 06:16:21 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.213]) with mapi id 14.03.0415.000; Tue, 21 May 2019 21:16:20 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "leif.lindholm@linaro.org" , "Zhang, Shenglei" Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Thread-Topic: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Thread-Index: AQHVDtrVGmEYr+UtJU+LPDmcEp3YG6Z09r0AgACZ7TA= Date: Tue, 21 May 2019 13:16:19 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E44ED39@SHSMSX104.ccr.corp.intel.com> References: <20190520070729.30812-1-shenglei.zhang@intel.com> <20190520070729.30812-13-shenglei.zhang@intel.com> <20190521120402.gl4shzs7lbqffxdr@bivouac.eciton.net> In-Reply-To: <20190521120402.gl4shzs7lbqffxdr@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTc1OTY1NTctODZmYi00OGJjLWExMzItOGI5YWExZmNlZmJlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoianBkQWdBRU9YNGhNSzB2a1lVb1phRkcyMWtaTmozNlF1YmZzNkM3MW5TSHVBeGVRcVRqMHVvWmZ6Z2dWQW1IdSJ9 dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Leif: > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Le= if Lindholm > Sent: Tuesday, May 21, 2019 8:04 PM > To: Zhang, Shenglei > Cc: devel@edk2.groups.io > Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada= 7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF >=20 > 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 fragm= ent > > files provided by NetworkPkg. > > > > v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc, > > Armada80x0Db.dsc and Armada80x0McBin.dsc. >=20 > Version comments go below "---" line. >=20 I will remove the version info in the commit message. Can I add your RB fo= r this patch? > > Cc: Leif Lindholm > > Signed-off-by: Shenglei Zhang > > --- > > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ > > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ > > .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++ >=20 > 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. >=20 Yes. I will follow this rule to generate the patch with the full file path= . > / > Leif >=20 > > 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 =3D Silicon/Marvell/Armada7k8k/Armad= a7k8k.fdf > > BOARD_DXE_FV_COMPONENTS =3D Platform/Marvell/Armada70x0Db/Ar= mada70x0Db.fdf.inc > > > > + # > > + # Network definition > > + # > > + DEFINE NETWORK_IP6_ENABLE =3D FALSE > > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > > + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > > + DEFINE NETWORK_ISCSI_ENABLE =3D 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 =3D Silicon/Marvell/Armada7k8k/Armad= a7k8k.fdf > > BOARD_DXE_FV_COMPONENTS =3D Platform/Marvell/Armada80x0Db/Ar= mada80x0Db.fdf.inc > > > > + # > > + # Network definition > > + # > > + DEFINE NETWORK_IP6_ENABLE =3D FALSE > > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > > + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > > + DEFINE NETWORK_ISCSI_ENABLE =3D 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 =3D Platform/SolidRun/Armada80x0McBi= n/Armada80x0McBin.fdf.inc > > CAPSULE_ENABLE =3D TRUE > > > > + # > > + # Network definition > > + # > > + DEFINE NETWORK_IP6_ENABLE =3D FALSE > > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > > + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > > + DEFINE NETWORK_ISCSI_ENABLE =3D FALSE > > + > > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > > > [LibraryClasses.common] > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/M= arvell/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/RealTimeClockLi= b/RealTimeClockLib.inf > > ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciRe= setSystemLib.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.in= f > > @@ -471,17 +465,7 @@ > > Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDx= e.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/Marve= ll/Armada7k8k/Armada7k8k.fdf > > index d2bbdedcfa..6face86577 100644 > > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > > @@ -129,17 +129,7 @@ FvNameGuid =3D 5eda4200-2c5f-43cb-9da3-0b= af74b1b30c > > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.i= nf > > > > # 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 > > >=20 >=20