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=TDbDC0KY; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Thu, 23 May 2019 09:59:49 -0700 Received: by mail-wr1-f66.google.com with SMTP id b18so7048321wrq.12 for ; Thu, 23 May 2019 09:59:48 -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=wQ4EaNnTER1YmcDEZFGCl4+s8/pY64RIvxV78nhct3g=; b=TDbDC0KYnLfoJ99LqtfxBDdLdOi5FZk+tB4EeFX/RIBWGdjCo6ihXmEoYdo0TdD4bG br/obrISJOjiDIYQrSDDhEAh3JbNAHzlCwF66/KQzW5R2FuDgaZvvnc66fqdShfMRNuX 6seKKbUcaI+yYzFwVh3hmYKU46qFtuVYl4224zKsapOWa498eSoEU4kKK/1fLudTeZeQ zKQTm2TSfpWM+LuTMCZxxOJrELtgWL0tgRG+OgTOb2O6GPynA4QEkkk2jX26eZXP2x6I mew3j9APGqQBHj/+RpuzfKTchnPdTJpEZSNWwsPH/F1LHmbPS7YOk185iUREES5Tvl+f 5irg== 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=wQ4EaNnTER1YmcDEZFGCl4+s8/pY64RIvxV78nhct3g=; b=hRVdpJj19IQF+6EpmWar8SEvb4rXSvMYRDSxIeZF3OWBU3NFEgw8ts+jU+vc4s0xbA iU6aWVKT45bfFq3oSH+6JKvo7LClyY1BUL3aOY9SyA01HJglG6P+yeRGfx+olXPi4O4c RW2n9IBNrSyaUDeaaKe42QJBFUmv+Ey/eeoclWoOTNEszMtgWqUnohtbQzwzTAOADhaH XhRgdgzgBqGvuXNFDlnT7yTpoBVrTnlCD89vsUnJoZ8JAlU7myaMDiXrYpB4Jin1fZu8 X9WAJ/Ww18gjQ7QxpkQ7kw9VBmN45nks9Q5EXtEGN95xvJXq5sy7+0U+HT8H5vmkRlwk HNlA== X-Gm-Message-State: APjAAAV0RsqJ0gj8p09TTLd3/VZOCBYkLz/rgRnP1x7+SqZyEGzPff/V Ane0A1e0r7iFzj42fgQJQMKb5q/nAGs= X-Google-Smtp-Source: APXvYqx+ZdEMS6G39enhtRGuneGicCN4tpdTQgBuzk4rCZkCbpUsyhCUpuXVk2uLr7uqXVP4YTJmdQ== X-Received: by 2002:a5d:6812:: with SMTP id w18mr14865491wru.16.1558630787038; Thu, 23 May 2019 09:59:47 -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 6sm36879804wrd.51.2019.05.23.09.59.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 May 2019 09:59:45 -0700 (PDT) Date: Thu, 23 May 2019 17:59:44 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, liming.gao@intel.com Cc: Shenglei Zhang Subject: Re: [edk2-devel] [Patch edk2-platform V4 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Message-ID: <20190523165944.74e2jmh2xt3bdhtl@bivouac.eciton.net> References: <20190521133623.20404-1-liming.gao@intel.com> <20190521133623.20404-5-liming.gao@intel.com> MIME-Version: 1.0 In-Reply-To: <20190521133623.20404-5-liming.gao@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 21, 2019 at 09:36:09PM +0800, Liming Gao wrote: > From: Shenglei Zhang > > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. > > Cc: Leif Lindholm > Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm > --- > Platform/Hisilicon/D05/D05.dsc | 45 ++++++++++----------------------------------- > Platform/Hisilicon/D05/D05.fdf | 23 +---------------------- > 2 files changed, 11 insertions(+), 57 deletions(-) > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > index dc9e1407ba..3c04b7ee24 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 > @@ -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 > 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.13.0.windows.1 > > > >