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:39:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:39:39 -0700 X-ExtLoop1: 1 Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga004.fm.intel.com with ESMTP; 21 May 2019 06:39:39 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 21 May 2019 06:39:39 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 21 May 2019 06:39:39 -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:39:37 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "leif.lindholm@linaro.org" , "Zhang, Shenglei" Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Thread-Topic: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Thread-Index: AQHVDtrKujiJPpsizUuyAgP3sVJvBqZ09PgAgACesLA= Date: Tue, 21 May 2019 13:39:36 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E44EDE8@SHSMSX104.ccr.corp.intel.com> References: <20190520070729.30812-1-shenglei.zhang@intel.com> <20190520070729.30812-5-shenglei.zhang@intel.com> <20190521115742.wkiqyskjblk22jnb@bivouac.eciton.net> In-Reply-To: <20190521115742.wkiqyskjblk22jnb@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGE1MjM2NDYtMTVlNy00ZmYzLWE4ZTUtNzM5NGY2YTg3ZmUzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWWdTVjF4elhkXC84WTJwSjJFeFVKMjU4Rmd3aExJa2p0M0xhenJkckFvQ1F5VG42Rml6NzJ0UU1TcHdtOTVlNDkifQ== 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: The unnecessary change is caused by the line ending. I send the new vers= ion patch. Please help review it.=20 On version info, I agree not to add them in the commit message. We can d= escribe them in the cover letter so that people know what changes in this v= ersion.=20 Thanks Liming > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Le= if Lindholm > Sent: Tuesday, May 21, 2019 7:58 PM > To: Zhang, Shenglei > Cc: devel@edk2.groups.io > Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05:= Update DSC/FDF to use NetworkPkg DSC/FDF >=20 > On Mon, May 20, 2019 at 03:07:15PM +0800, Shenglei Zhang wrote: > > This patch updates the platform DSC/FDF files to use the include fragm= ent > > files provided by NetworkPkg. > > > > v2: Withdraw unrelated changes. >=20 > Any comments on changes since previous patch go underneath the "---" > line below - they do not belong in the commit message. >=20 > > Cc: Leif Lindholm > > Signed-off-by: Shenglei Zhang > > --- > > Platform/Hisilicon/D05/D05.dsc | 59 ++++++++++-----------------------= - > > Platform/Hisilicon/D05/D05.fdf | 23 +------------ > > 2 files changed, 18 insertions(+), 64 deletions(-) > > > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D= 05.dsc > > index dc9e1407ba..239bc776f9 100644 > > --- a/Platform/Hisilicon/D05/D05.dsc > > +++ b/Platform/Hisilicon/D05/D05.dsc > > @@ -23,8 +23,15 @@ > > SKUID_IDENTIFIER =3D DEFAULT > > FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NA= ME)/$(PLATFORM_NAME).fdf > > DEFINE EDK2_SKIP_PEICORE=3D0 > > - DEFINE NETWORK_IP6_ENABLE =3D FALSE > > - DEFINE HTTP_BOOT_ENABLE =3D FALSE > > + > > + # > > + # Network definition > > + # > > + DEFINE NETWORK_SNP_ENABLE =3D FALSE > > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > > + DEFINE NETWORK_VLAN_ENABLE =3D FALSE > > + DEFINE NETWORK_IP6_ENABLE =3D FALSE > > + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > > > > !include Silicon/Hisilicon/Hisilicon.dsc.inc > > > > @@ -37,12 +44,8 @@ > > > > IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf > > > > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > > HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf > > UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiS= ervicesLib.inf > > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTr= eeLib/BaseOrderedCollectionRedBlackTreeLib.inf > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/Dxe= ReportStatusCodeLib.inf > > DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > @@ -50,11 +53,6 @@ > > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > > > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > - > > -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > -!endif > > > > !ifdef $(FDT_ENABLE) > > #FDTUpdateLib > > @@ -89,10 +87,10 @@ > > > > LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf > > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011Serial= PortLib.inf > > - PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/Platfo= rmPciLib.inf > > + PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/Platfo= rmPciLib.inf >=20 > This no-op change needs to go. > Please verify the patches manually before resubmitting. >=20 > > PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHos= tBridgeLib.inf > > PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/= Hi161xPciSegmentLib.inf > > - PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLi= b/Hi161xPciPlatformLib.inf > > + PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLi= b/Hi161xPciPlatformLib.inf >=20 > This no-op change needs to go. > Please verify the patches manually before resubmitting. >=20 > > > > [LibraryClasses.common.SEC] > > ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/Ar= mPlatformLibSec.inf > > @@ -130,7 +128,7 @@ > > > > [PcdsFixedAtBuild.common] > > gArmPlatformTokenSpaceGuid.PcdCoreCount|8 > > - gArmTokenSpaceGuid.PcdPciIoTranslation|0 > > + gArmTokenSpaceGuid.PcdPciIoTranslation|0 >=20 > This no-op change needs to go. > Please verify the patches manually before resubmitting. >=20 > > > > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 > > > > @@ -466,7 +464,7 @@ > > ArmPkg/Drivers/CpuDxe/CpuDxe.inf > > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > > > - ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf > > + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf >=20 > This no-op change needs to go. > Please verify the patches manually before resubmitting. >=20 > > Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.= inf > > > > Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf > > @@ -532,30 +530,7 @@ > > > > Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf > > > > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > > - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - NetworkPkg/TcpDxe/TcpDxe.inf > > - NetworkPkg/IScsiDxe/IScsiDxe.inf > > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > - NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > -!endif > > -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > - NetworkPkg/DnsDxe/DnsDxe.inf > > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > - NetworkPkg/HttpDxe/HttpDxe.inf > > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf > > -!endif > > - > > - > > +!include NetworkPkg/Network.dsc.inc > > Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf > > > > SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepor= tDxe.inf > > @@ -602,10 +577,10 @@ > > > > NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciL= ib.inf > > } > > - Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { > > + Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { > > > > - NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciL= ib.inf > > - } > > + NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciL= ib.inf > > + } >=20 > This no-op change needs to go. > Please verify the patches manually before resubmitting. >=20 > / > Leif >=20 > > MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { > > > > NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciL= ib.inf > > diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D= 05.fdf > > index 812f7f2690..c18f23482f 100644 > > --- a/Platform/Hisilicon/D05/D05.fdf > > +++ b/Platform/Hisilicon/D05/D05.fdf > > @@ -246,28 +246,7 @@ READ_LOCK_STATUS =3D TRUE > > INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf > > INF Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf > > > > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 > > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > -!endif > > -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > - INF NetworkPkg/DnsDxe/DnsDxe.inf > > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > - INF NetworkPkg/HttpDxe/HttpDxe.inf > > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > > -!endif > > +!include NetworkPkg/Network.fdf.inc > > > > !ifdef $(FDT_ENABLE) > > INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf > > -- > > 2.18.0.windows.1 > > >=20 >=20