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=Xw/Mk2pd; spf=pass (domain: linaro.org, ip: 209.85.221.65, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by groups.io with SMTP; Thu, 16 May 2019 13:06:35 -0700 Received: by mail-wr1-f65.google.com with SMTP id w8so4725716wrl.6 for ; Thu, 16 May 2019 13:06:34 -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=YuTJf61i3UlBq3Fb7N19cXucQiEidQ6nMR3Pf04BoCc=; b=Xw/Mk2pdI0xiEa+YrOGQUxV2OEQkxyb2toWPN741tkuPuF0jjWQz+PGjp+NSADwmG5 ZMjO6qD7dp3cx2gGNEb917OgR9WF4aWkEy0rUhHrfXENx5MaUyPNdEyagLNpnDuckrv8 hTkMXB6ni8BlGaYlBjjX9kKSTguxnq2141lUJzlLtNVFoAEya5bE8bWlkQyFK0iSpBFR ySfYK+tMRuMyxmdsfzXSnTHsqj4fxe0GsVzQENex8GeBUsuD0rtnFrYj+qc1dMUs7Jsr cCRRn+KaTe40A9QP/FMqluQ3oD3bgnbB3zEe6INE/1eZt9RXFiCaoRFLexFsaPsFl+RU weew== 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=YuTJf61i3UlBq3Fb7N19cXucQiEidQ6nMR3Pf04BoCc=; b=CUbUACB0EmcBUZLeyIxwEM3Kf+pus6eKBfkWxV01HJpmt8pyUXgkxE70kXiRTgqWST JDdbhZ4KgzYgFoY5Pdhmgg26wFA4VNMQZKZLAO8mFjwHDo7+x+hL6QDVln9GSdPL3RXq QjvAR7pNr8N/ffrl2Xxb7pX4lmPkQjqPi0DQlc0P2/7d2aGZGUSeGHvhgCys1szJw7BH fTqPLYNV/L9VawoZLPsmXP9hvCgehf5xoggEf25oMxmYEzawq9pEKDmm/3vsNHHtNwOq REk11u9wFZoFvBVCWljAfaOlc5wEiOYKV9H4RwjTZCOVyx6JpLdqMq65pXTVMDIJK9oD fgug== X-Gm-Message-State: APjAAAX34AMCNy2+11fIpvyw7vV3iS8Kny5d+RL3MDFeWwjBrrJLovGe rKWGqJz3qYg0B0sadc+q01ezm6CD+Cc= X-Google-Smtp-Source: APXvYqyy5tEDpXTXZfha2WA2OPi7RjwIHqhOcaVJQkvcA4cb9lLLQglCNPzsDhqHdpN4sZhkRnR3Dw== X-Received: by 2002:adf:e70f:: with SMTP id c15mr16200767wrm.311.1558037192995; Thu, 16 May 2019 13:06:32 -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 x6sm8889749wru.36.2019.05.16.13.06.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 May 2019 13:06:32 -0700 (PDT) Date: Thu, 16 May 2019 21:06:30 +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 08/16] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg's include fragment file. Message-ID: <20190516200630.zj5rtgeizaya5goe@bivouac.eciton.net> References: <20190515085701.24724-1-shenglei.zhang@intel.com> <20190515085701.24724-9-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515085701.24724-9-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:53PM +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 Reviewed-by: Leif Lindholm > --- > Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++++++--------------- > Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +----------- > 2 files changed, 9 insertions(+), 34 deletions(-) > > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > index bc2f3e2076..85ef45093a 100644 > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > @@ -29,6 +29,13 @@ DEFINE NUM_CORES = 4 > SKUID_IDENTIFIER = DEFAULT > FLASH_DEFINITION = Platform/LeMaker/CelloBoard/CelloBoard.fdf > > + # > + # Network definition > + # > + DEFINE NETWORK_IP6_ENABLE = FALSE > + DEFINE NETWORK_TLS_ENABLE = FALSE > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > + > ################################################################################ > # > # Library Class section - list of all Library Classes needed by this Platform. > @@ -75,13 +82,6 @@ DEFINE NUM_CORES = 4 > > BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf > > - # Networking Requirements > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > - > # ARM Architectural Libraries > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf > @@ -580,19 +580,7 @@ DEFINE NUM_CORES = 4 > # > # Networking stack > # > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > -# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf > - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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 > +!include NetworkPkg/Network.dsc.inc > > # > # Core Info > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf > index d34b986b93..eae0019a1b 100644 > --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf > @@ -178,20 +178,7 @@ READ_LOCK_STATUS = TRUE > # > # Networking stack > # > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > -# INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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 > - > +!include NetworkPkg/Network.fdf.inc > # > # Core Info > # > -- > 2.18.0.windows.1 > > > >