[edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF

Liming Gao liming.gao at intel.com
Tue May 21 13:39:36 UTC 2019 

Leif:
  The unnecessary change is caused by the line ending. I send the new version patch. Please help review it. 

  On version info, I agree not to add them in the commit message. We can describe them in the cover letter so that people know what changes in this version. 

Thanks
Liming
> -----Original Message-----
> From: devel at edk2.groups.io [mailto:devel at edk2.groups.io] On Behalf Of Leif Lindholm
> Sent: Tuesday, May 21, 2019 7:58 PM
> To: Zhang, Shenglei <shenglei.zhang at intel.com>
> Cc: devel at edk2.groups.io
> Subject: Re: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF
> 
> 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 fragment
> > files provided by NetworkPkg.
> >
> > v2: Withdraw unrelated changes.
> 
> Any comments on changes since previous patch go underneath the "---"
> line below - they do not belong in the commit message.
> 
> > Cc: Leif Lindholm <leif.lindholm at linaro.org>
> > Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
> > ---
> >  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/D05.dsc
> > index dc9e1407ba..239bc776f9 100644
> > --- a/Platform/Hisilicon/D05/D05.dsc
> > +++ b/Platform/Hisilicon/D05/D05.dsc
> > @@ -23,8 +23,15 @@
> >    SKUID_IDENTIFIER               = DEFAULT
> >    FLASH_DEFINITION               = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
> >    DEFINE EDK2_SKIP_PEICORE=0
> > -  DEFINE NETWORK_IP6_ENABLE      = FALSE
> > -  DEFINE HTTP_BOOT_ENABLE        = FALSE
> > +
> > +  #
> > +  # Network definition
> > +  #
> > +  DEFINE NETWORK_SNP_ENABLE             = FALSE
> > +  DEFINE NETWORK_TLS_ENABLE             = FALSE
> > +  DEFINE NETWORK_VLAN_ENABLE            = FALSE
> > +  DEFINE NETWORK_IP6_ENABLE             = FALSE
> > +  DEFINE NETWORK_HTTP_BOOT_ENABLE       = 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/UefiHiiServicesLib.inf
> > -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> > -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> >    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> >    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.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) == 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/PL011SerialPortLib.inf
> > -  PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> > +  PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >    PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf
> >    PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf
> > -  PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
> > +  PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >
> >  [LibraryClasses.common.SEC]
> >    ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > @@ -130,7 +128,7 @@
> >
> >  [PcdsFixedAtBuild.common]
> >    gArmPlatformTokenSpaceGuid.PcdCoreCount|8
> > -  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> > +  gArmTokenSpaceGuid.PcdPciIoTranslation|0
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >
> >    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
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> >    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) == TRUE
> > -  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> > -  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> > -  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> > -  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> > -!endif
> > -!if $(HTTP_BOOT_ENABLE) == 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/SystemFirmwareReportDxe.inf
> > @@ -602,10 +577,10 @@
> >      <LibraryClasses>
> >        NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> >    }
> > -  Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {
> > +  Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf {
> >      <LibraryClasses>
> > -      NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> > -  }
> > +      NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> > +  }
> 
> This no-op change needs to go.
> Please verify the patches manually before resubmitting.
> 
> /
>     Leif
> 
> >    MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
> >      <LibraryClasses>
> >        NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf
> > diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> > index 812f7f2690..c18f23482f 100644
> > --- a/Platform/Hisilicon/D05/D05.fdf
> > +++ b/Platform/Hisilicon/D05/D05.fdf
> > @@ -246,28 +246,7 @@ READ_LOCK_STATUS   = 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) == 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) == 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
> >
> 
> 


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

View/Reply Online (#41149): https://edk2.groups.io/g/devel/message/41149
Mute This Topic: https://groups.io/mt/31682815/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

More information about the edk2-devel-archive mailing list