From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=i6IA1xPj; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by groups.io with SMTP; Tue, 21 May 2019 04:57:47 -0700 Received: by mail-wm1-f65.google.com with SMTP id x64so2688077wmb.5 for ; Tue, 21 May 2019 04:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=eH0AILhKFuJ/J763DdMcx4nLYYhyVbH5/LMeXiY2fN8=; b=i6IA1xPjgxaRGqvLjF1QSBVOmLlEDsHA9TihZJUlUAdXY6FvyrcYbUABMa4WltHpEh QSbrPCBUNyz2qPl9FeFd9dpo3qHNYLKX8UekEtHhJXGIdDgZAlJXsXoNBQwRzTmjVQGT GnK3nX30aUWOIzg/tcJHS/c/8utTjS3vBkvUMF4qt+MkiGnC8K6/OwZypV4D/FmyP8Qf kVkU6P+foScBKEeEKIZrD5NBTIYmVbXaeBLyQMiBvgxiRwlNFtdEyKxhGyYkYuZgWaLd +S1CEmbH1kts/lXIj3NhHB+A5AUeUt9EtLXnrQBF7bufQZPq1Vhy5c3hr3MK2jSQaL9o av4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=eH0AILhKFuJ/J763DdMcx4nLYYhyVbH5/LMeXiY2fN8=; b=O3e21vNKr3XDeJzL/bsGL96lrX62hwbqI43Qtbdy4KGWOPyc5Y8dtGG9mS54rtgJt2 kxSpR8zfYk85iqcguFabzGqzWIdTfz80Jf1YOA+cXOuxZDgqOSdW5GaI2v1n9SksAqjw qy71EEoKdTZE4tux6w3c9QL3300eiYuWSTgQ9tyelP/VSu0nOjmLaN1pHMYNN7bcF+J2 B2Qbm0KRur72R3Yr9lM6jdk3afSH5cL+T7XgONNqyOML80t7OXFElPciBK7B3xSBLRIO YGTYcFbuG5dGrxKqHK1nWyqDZaFLYdcbY/7KBGa7waT3WKbEgIs5ix3YiR5F11YyVHSK TufQ== X-Gm-Message-State: APjAAAXWjyksfF54QZWpkQFzOAmS53CIXyWK4KW491KCxRm+lNGKerUj HEUR3rqjYD8Al6Z8xt+5y0AEAg== X-Google-Smtp-Source: APXvYqxNkirowcpv/15VUIKUm776dR7LHFiEm/WOgNsL1omzDXvKH0B1q2gRVnFb/RZehmdPvcwsTw== X-Received: by 2002:a7b:cb48:: with SMTP id v8mr3295561wmj.108.1558439865530; Tue, 21 May 2019 04:57:45 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id b136sm3219986wmg.1.2019.05.21.04.57.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2019 04:57:44 -0700 (PDT) Date: Tue, 21 May 2019 12:57:42 +0100 From: "Leif Lindholm" To: Shenglei Zhang Cc: devel@edk2.groups.io Subject: Re: [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Message-ID: <20190521115742.wkiqyskjblk22jnb@bivouac.eciton.net> References: <20190520070729.30812-1-shenglei.zhang@intel.com> <20190520070729.30812-5-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190520070729.30812-5-shenglei.zhang@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > 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/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 @@ > > NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf > } > - Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { > + Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { > > - 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 { > > 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 >