From nobody Fri Apr 26 18:33:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40663+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40663+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557910631; cv=none; d=zoho.com; s=zohoarc; b=G4MimUOdEDBQNfzV+gLyHuqMTEuhbnP4LseaqE89YGYIjRZfIlhb767iCiDfnIV5gpo+MvhF62ut6lmcVaOOb8W/Bdwqk8M3s9Ukev1FqEJXJpXFflTz++iBmrqYzJ21HIZvgRpIS89mgJ9KrlQjcN16QVHTnEhUokrWEPtVcVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557910631; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=UzzX/gYNZseH81u//D+9FV10dtXHgCymOee61ESg+r4=; b=lYDKJutPJ3ClCOJvb5TAX7tTOoRpt81bP011MJnBFxmuXRrcuXAfizqbt0TbatR/OOhKg1OL6mqIp0PztbCRRhRFMahzkjmHo+c4LpCaTWURS7NspNzLEW/NyNYwiwJG6zavovj53M0PVtm2ygIr9Dxn1NuWRMmtSy5S913M5Xg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40663+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557910631783986.3550276462393; Wed, 15 May 2019 01:57:11 -0700 (PDT) Return-Path: X-Received: from mga01.intel.com (mga01.intel.com []) by groups.io with SMTP; Wed, 15 May 2019 01:57:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 May 2019 01:57:09 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga001.jf.intel.com with ESMTP; 15 May 2019 01:57:09 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms 03/16] Hisilicon/D03: Update DSC/FDF to use NetworkPkg's include fragment file. Date: Wed, 15 May 2019 16:56:48 +0800 Message-Id: <20190515085701.24724-4-shenglei.zhang@intel.com> In-Reply-To: <20190515085701.24724-1-shenglei.zhang@intel.com> References: <20190515085701.24724-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557910630; bh=jpTh0+RBEZcxi0MIF3jM3Bs3tV8NA+In5cPEPucgolE=; h=Date:From:Reply-To:Subject:To; b=JgaUAIx1TxXG14wvylKTa8Fn39h8MjdXOc2ANKAUBRkM+1huGR7nH+4XP1sYK1Ye/5C AVaXNTCsx/KasqPzJJ2itXM8Q6nZuMKs/0t4Asl4Sgx6NjwjjF75uPAywiE7VSTfrjDse HLMhwbTJYrB9TPiX87HRna3hX4TY+g9q6mQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/D03/D03.dsc | 26 +++++++++++--------------- Platform/Hisilicon/D03/D03.fdf | 10 +--------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 07ff461277..d98997c59e 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -29,6 +29,16 @@ SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 + # + # Network definition + # + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE + DEFINE NETWORK_ISCSI_ENABLE =3D FALSE + DEFINE NETWORK_VLAN_ENABLE =3D FALSE + !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 [LibraryClasses.common] @@ -40,13 +50,8 @@ =20 IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf =20 - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - =20 =20 !ifdef $(FDT_ENABLE) @@ -404,16 +409,7 @@ =20 Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf =20 - 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 - +!include NetworkPkg/Network.dsc.inc Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf =20 SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf index 3f07b2e577..fc8a2945ea 100644 --- a/Platform/Hisilicon/D03/D03.fdf +++ b/Platform/Hisilicon/D03/D03.fdf @@ -246,15 +246,7 @@ READ_LOCK_STATUS =3D TRUE INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf INF Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf =20 - 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 +!include NetworkPkg/Network.fdf.inc =20 !ifdef $(FDT_ENABLE) INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40663): https://edk2.groups.io/g/devel/message/40663 Mute This Topic: https://groups.io/mt/31627854/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-