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=Vc1F+AqA; 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 13:10:16 -0700 Received: by mail-wm1-f66.google.com with SMTP id i3so4836443wml.4 for ; Thu, 16 May 2019 13:10:15 -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=3l0zp6OabLAw8apUCebWtqo/z91XzqeGY8hYXI8U64U=; b=Vc1F+AqA8Z1w40YCoAUvpiGn1iCUSpuS7S+MTGHhEKtuihrnnqPaGmkTQT4/FvLO0A Naz/XBqHetqCvPefvgj8Uv5wJK6gZZvW3ftF114A/gFvH2/5VePuRigCl9czUADamCkq l5oNpz13Mi34BJaYklun2tCWJWbQ9lAp7aFB9VJJHI6yV0HJb0jdmEUsInlQMsRQ6SmW kN02fNZ6506fLw7upC2Jx+8eU10u4LZyYieJ9Elf8bS28fUEXuwyIO5odFZUu6R8ramP SzjcVRjEnSfE0k4k/vq6fu+6HeYHUl4/a6Ud6Pml5jSRbVZz3eGWj2lDhulDBSYDS7pq 0ksA== 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=3l0zp6OabLAw8apUCebWtqo/z91XzqeGY8hYXI8U64U=; b=BmtIjMOA/wj4V0tl/xxwhdkMAlfY87eqzwekdZ7ODK7b3Rq3DgIcbIlqU9i7eKynca /oub38f/NxFdOUAhxx8p1fHBaJ7sOu5jNMf4lPO/IaEC3HaA5rhjqWXh3bwy7TAt7joq 3bCVt8LKXlOuEfr7CYXucaDaETHV3pdClp66hPoKVxd8R5YsG42vIFgKhltsjT38ayJh NiZBub2te8pj/OZr7LcabqstiT4czjLUQYNENEuXOMNuyNVk2wqlZIa/qeMwWV2rqC34 LhyEvl5FaDGS3Xkzzo3hbTURoJ8uAlz4hLDZQ2CplfuHNEeNhfNHy9VCanpGuBmVBnoW GxNg== X-Gm-Message-State: APjAAAVhKLeDk/y/XhdVMnxC2UM1DWi/cAQLxRH8n/wojodQNlYJlWbr EiJpUPetPLa+m8vIF8rl6ffnySrcM/8= X-Google-Smtp-Source: APXvYqyo6yMklga1xxCAScRcdIYwIh9V0BW/qlT/tru8Me071xccjb/B1M6lLL9Q32cGMWo4QT6gug== X-Received: by 2002:a1c:c7c8:: with SMTP id x191mr19887013wmf.126.1558037414070; Thu, 16 May 2019 13:10:14 -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 d17sm281143wrw.18.2019.05.16.13.10.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 May 2019 13:10:13 -0700 (PDT) Date: Thu, 16 May 2019 21:10:11 +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 10/16] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg's fragment file. Message-ID: <20190516201011.3gkeheid37guelyv@bivouac.eciton.net> References: <20190515085701.24724-1-shenglei.zhang@intel.com> <20190515085701.24724-11-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515085701.24724-11-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:55PM +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 > --- > .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++++-------------- > .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++--------- > 2 files changed, 10 insertions(+), 46 deletions(-) > > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > index 8dbf836f7e..9961c91141 100644 > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > @@ -28,6 +28,12 @@ > FLASH_DEFINITION = Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf > BUILD_NUMBER = 1 > > + # > + # Network definition > + # > + DEFINE NETWORK_SNP_ENABLE = FALSE > + DEFINE NETWORK_TLS_ENABLE = FALSE > + > [BuildOptions] > RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 > > @@ -55,11 +61,6 @@ > > BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf > > - # Networking Requirements > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > > # ARM Architectural Libraries > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > @@ -119,9 +120,6 @@ > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf > PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf > > - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > - > NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > > @@ -600,25 +598,8 @@ > # > # Networking stack > # > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.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/Ip6Dxe/Ip6Dxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/IScsiDxe/IScsiDxe.inf > - NetworkPkg/DnsDxe/DnsDxe.inf > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > - NetworkPkg/HttpDxe/HttpDxe.inf > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!include NetworkPkg/Network.dsc.inc > + > Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf { > > DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf > index 1e07f579a8..cafa2083bf 100644 > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf > @@ -192,25 +192,8 @@ READ_LOCK_STATUS = TRUE > # > # Networking stack > # > - 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/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/Ip6Dxe/Ip6Dxe.inf > - INF NetworkPkg/TcpDxe/TcpDxe.inf > - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf > - INF NetworkPkg/DnsDxe/DnsDxe.inf > - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > - INF NetworkPkg/HttpDxe/HttpDxe.inf > - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!include NetworkPkg/Network.dsc.inc Network.fdf.inc, surely? Please make sure this mistake has not been copied to other platforms I have already reviewed. / Leif > + > INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf > > # > -- > 2.18.0.windows.1 > > > >