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=SFoLjK/9; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Thu, 16 May 2019 09:57:46 -0700 Received: by mail-wm1-f66.google.com with SMTP id j187so7477321wma.1 for ; Thu, 16 May 2019 09:57:45 -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=IoDi9wnyJ9/z2PI9IXMakSIOZukKLriJNTJHcOIEr+k=; b=SFoLjK/9KYcYnzYLs6z+rCj4DnL5nrJmLpyjx6xHLBMc46IRgnuSfPBzEdRlUVaZRP 1CO9SakHhtFkYq3KfjCDG/F9ijCQkCKza4M7/OwIfZfqNjTGA+bEDM+QE9b1WJNuzAoP APcPzsJ4df70iTCd9UdXIDOoyk6cuSsqTgCGo2pfByw9l3dgFcT3D3LpBI8xWA9xEjaq KMYKJdzf0BGBMtrCJJmONvxVwoRJMaRfny51ECfVyhBXTgOx3f3ZVTFAFZMn3i2rUyAW 2kU42JUrC+NP6Kg9KX1oC23Z3vCIzxF9ztw+G/3NB9UO/81/5bcO/K+DrgUdhRP1jCHP z2XQ== 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=IoDi9wnyJ9/z2PI9IXMakSIOZukKLriJNTJHcOIEr+k=; b=lkR5STUKaf9ejSFQSG6ZvIe622T23adnC4v737xiZCwssVHas7Sj3+5uYsMvYBg5Nr XNDSVngzXKXPT9oU9kiumL3XqQngFEA9L8gtnR4mUe6Jk0hyyXMYnCq3tvcAbgZBARbn A++FsBqiyvBKmRI6+Z+9U5UYIPncHywKw4MyHZjx5j+n2Cj1r2rIl2evJv4/LP8kA8Dr EIWo1Khkb7MaNVPUifFiTnKROJUUjGCjO/QOCKWUczc47iVcRSJoga374e3Inmfmbngf nD1TfFBeiWQiI9bSbx1/Ds4zNdlEwos1GxUh8hQcTc3Q4+mffCPQoxIksVbz+sDeS8aD pdDA== X-Gm-Message-State: APjAAAX6ye6SzxmbosisObWTRTV+lcwM5v/SpKa1OPViuHgTWMhlNDvE w7MN5aLEGluIyujTnUEY44a3LUZSSKg= X-Google-Smtp-Source: APXvYqwD0Om0/D3ksTDS4TH32dUoNOigayDOUCNF4lh/Za6BonrF0+ik8vO2gF0jHNC4xLOLz3NCcQ== X-Received: by 2002:a1c:9a14:: with SMTP id c20mr12441693wme.104.1558025864277; Thu, 16 May 2019 09:57:44 -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 t7sm7684501wrq.76.2019.05.16.09.57.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 May 2019 09:57:43 -0700 (PDT) Date: Thu, 16 May 2019 17:57:42 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, shenglei.zhang@intel.com Cc: ard.biesheuvel@linaro.org Subject: Re: [edk2-devel] [PATCH edk2-platforms 04/16] Hisilicon/D05: Update DSC/FDF to use NetworkPkg's include fragment file. Message-ID: <20190516165742.oet5colpu7f2tlqm@bivouac.eciton.net> References: <20190515085701.24724-1-shenglei.zhang@intel.com> <20190515085701.24724-5-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515085701.24724-5-shenglei.zhang@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, May 15, 2019 at 04:56:49PM +0800, Zhang, Shenglei wrote: > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. > > Signed-off-by: Shenglei Zhang > --- > Platform/Hisilicon/D05/D05.dsc | 56 +++++++++++----------------------- > Platform/Hisilicon/D05/D05.fdf | 23 +------------- > 2 files changed, 19 insertions(+), 60 deletions(-) > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > index 70b044c7e3..878ab5adf6 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -29,8 +29,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 > > @@ -43,12 +50,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 > @@ -58,7 +61,7 @@ > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!if $(HTTP_BOOT_ENABLE) == TRUE > +!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif > > @@ -95,10 +98,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 > 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 These changes appear unrelated. > > [LibraryClasses.common.SEC] > ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf > @@ -136,7 +139,7 @@ > > [PcdsFixedAtBuild.common] > gArmPlatformTokenSpaceGuid.PcdCoreCount|8 > - gArmTokenSpaceGuid.PcdPciIoTranslation|0 > + gArmTokenSpaceGuid.PcdPciIoTranslation|0 This one too. > > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 > > @@ -472,7 +475,7 @@ > ArmPkg/Drivers/CpuDxe/CpuDxe.inf > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > - ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf > + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf And this. > Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf > > Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf > @@ -538,30 +541,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 > @@ -608,10 +588,10 @@ > > NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf > } > - Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { > + Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { And this? > > - NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf > - } > + NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf > + } And this? Please resolve the unrelated issues. / 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 9632aea4b0..21e04ce9a8 100644 > --- a/Platform/Hisilicon/D05/D05.fdf > +++ b/Platform/Hisilicon/D05/D05.fdf > @@ -252,28 +252,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 > > > >