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=vqv3UesU; 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 10:02:58 -0700 Received: by mail-wm1-f66.google.com with SMTP id c77so2905575wmd.1 for ; Thu, 16 May 2019 10:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=em/ZzbUNzbjBpM1VBD39OLUhKYi89vPAmIz7zFEfKec=; b=vqv3UesUwCLi5AlwFII6tZT0Kl2PBvoV5h9aRcV7a38mJTpE71mxSuv9I6m5DWWMnD F2dVoVUrkEPno3RrfzO6NcE6zpTe17Qwp99uShv70fXwFRXw4tcb2Tt6nlRYrrJB4Tkk 9KHarcBQE1Pnz109d/obaz8vICAu9zi88xRgJKye3MCAoOOAsG6//wjfX7+z/BV4HaKc 8HPOP+TSqhZilZNZoVg7qfhp7ANj5Py8e5PCwbW0AbZ8i2YNXOyjzjfyZ/p80Kew1Rmh l9eiCTH7MU6LsLdMGHIjTkisdP6MJqezOHbf5QbsGWomhFRxnziIDQnfCOu8rXE6KKtX /EUQ== 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:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=em/ZzbUNzbjBpM1VBD39OLUhKYi89vPAmIz7zFEfKec=; b=dG6YzOAyGV6YA14e8F3CQXi4E2rP18EcYgx0hoTS0h6yA2o4pKiYoxz6VupSjEkn78 jKwcR6FN61EGIpX1bHi0CmipaL8aIPCfH7zwsAhoVtVUoeiBMfNSQSNx32wUWiZL/Azo ZBH43EYSVHDaGrD55ysH7QAivYt0ewjfWk8HBGlKR7T0JVvvI6uiorbmkyR/KTCAYcmm 6HgNIVt7I2a4d64XcoGeuNQtoL0AdhOgvryg2VNpRaE0jVYOPNxaUZU/qG745OraQmop BVq9wVeRLiUyGHNDnYrOD+yVLst0aCdeQf59Su6EESpN0JhQlJ9yOEQBS2Nzx4NmxAYI gzlQ== X-Gm-Message-State: APjAAAVv2/CxL5Vgm8A8PEJkuw4nZ/uzQPlNzEMfFtR6CcrSlNKmphNv Jus1YK6pqgjXFrzzhXf7yF1kftrSINA= X-Google-Smtp-Source: APXvYqy0basATcoGzb9XQTagd8jYvJExpiBcGdNTBYdFptCEYnyAK0FJGgajpPCPjajEm9nzyrXsrw== X-Received: by 2002:a1c:730c:: with SMTP id d12mr28670586wmb.10.1558026176438; Thu, 16 May 2019 10:02:56 -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 h8sm9355643wmf.5.2019.05.16.10.02.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 May 2019 10:02:55 -0700 (PDT) Date: Thu, 16 May 2019 18:02:54 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, shenglei.zhang@intel.com Subject: Re: [edk2-devel] [PATCH edk2-platforms 05/16] Hisilicon/D06: Update DSC/FDF to use NetworkPkg's include fragment file. Message-ID: <20190516170254.eldjev3lrao43cyy@bivouac.eciton.net> References: <20190515085701.24724-1-shenglei.zhang@intel.com> <20190515085701.24724-6-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515085701.24724-6-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:50PM +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/Hisilicon/D06/D06.dsc | 42 ++++++++-------------------------- > Platform/Hisilicon/D06/D06.fdf | 27 +--------------------- > 2 files changed, 11 insertions(+), 58 deletions(-) > > diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc > index 73bea728b0..e6cd975255 100644 > --- a/Platform/Hisilicon/D06/D06.dsc > +++ b/Platform/Hisilicon/D06/D06.dsc > @@ -28,8 +28,14 @@ > BUILD_TARGETS = DEBUG|NOOPT|RELEASE > SKUID_IDENTIFIER = DEFAULT > FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf > - DEFINE NETWORK_IP6_ENABLE = FALSE > - DEFINE HTTP_BOOT_ENABLE = FALSE > + > + # > + # Network definition > + # > + 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 > > @@ -42,12 +48,8 @@ > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > 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 > @@ -55,9 +57,8 @@ > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!if $(HTTP_BOOT_ENABLE) == TRUE > +!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif > > @@ -346,30 +347,7 @@ > # > #network > # > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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 > > MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf > MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf > diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf > index e402628a1b..fda896097a 100644 > --- a/Platform/Hisilicon/D06/D06.fdf > +++ b/Platform/Hisilicon/D06/D06.fdf > @@ -245,32 +245,7 @@ READ_LOCK_STATUS = TRUE > # > #Network > # > - INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf > - > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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 > > # > # PCI Support > -- > 2.18.0.windows.1 > > > >