From nobody Thu Apr 25 01:20:06 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+40666+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+40666+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557910635; cv=none; d=zoho.com; s=zohoarc; b=Uj7G23sXPi7llD1bohtshYBNsFvSaDgWl5RWlmDiBKHomdlVqVOWiDxhxttqNYT3/vJwAl/37bYTpcG9GotCuL0Boy6saCasRjtp8EV82G3sodyYbVcjeXZ5DpoQwiyJNkExN/wGU9/7LWmlBvopiRBNBtOyFqh6fQEil+PIWV0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557910635; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=RMzavYVl2JEHyjMnjslkvgsdH5bCuQOaS5+eAEsATO4=; b=BtGFb8OSAb1iO23e0t7aUFAV/O0MGASwCi4z7sC5OK92kcz8Cm2F9/kHYvZ3d4LWNLyE3bGqskrouqedyHkdHgEBJeweVArUoUC7riY9Kv9ow67ChGEii3R6aIaUvlpmM6LJTKyI6S4igFAgixcf1xouyRExDmvXrb7/mZv4aV8= 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+40666+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 1557910635830933.2637287355383; Wed, 15 May 2019 01:57:15 -0700 (PDT) Return-Path: X-Received: from mga01.intel.com (mga01.intel.com []) by groups.io with SMTP; Wed, 15 May 2019 01:57:14 -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:13 -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:12 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms 06/16] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg's include fragment file. Date: Wed, 15 May 2019 16:56:51 +0800 Message-Id: <20190515085701.24724-7-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=1557910634; bh=X3UDUfIQrCCs5o6kzNbL0KGhChBVVzYS1eAPlEA/aBI=; h=Date:From:Reply-To:Subject:To; b=RB9g6hSdaMab6MDKo1QIjPX8aCrtXgl6BNCANBZKxaIYEn52AIsa4GkVQH0wXyGWLmH lq7fAOS+SteC2RkHzAUnLuGLx+AfzglldSCUQb3D/eO16drjVtzb3bC486SXUTYVUI1x1 VMyOIXY7hbgecD83uYKJaFnLCP0W832rj4Q= 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/HiKey/HiKey.dsc | 26 ++++++++++---------------- Platform/Hisilicon/HiKey/HiKey.fdf | 10 +--------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/= HiKey.dsc index 7e05babb6c..2081e95b06 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -28,6 +28,15 @@ =20 DEFINE CONFIG_NO_DEBUGLIB =3D TRUE =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] @@ -53,12 +62,6 @@ # USB Requirements UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf =20 - # Network Libraries - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - # VariableRuntimeDxe Requirements SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniza= tionLib.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf @@ -245,16 +248,7 @@ # # UEFI Network Stack # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - +!include NetworkPkg/Network.dsc.inc # # AX88772 Ethernet Driver # diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/= HiKey.fdf index 7e6c8083bb..aadbfc0075 100644 --- a/Platform/Hisilicon/HiKey/HiKey.fdf +++ b/Platform/Hisilicon/HiKey/HiKey.fdf @@ -159,15 +159,7 @@ READ_LOCK_STATUS =3D TRUE # # UEFI Network Stack # - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/TcpDxe/TcpDxe.inf +!include NetworkPkg/Network.fdf.inc =20 # # AX88772 Ethernet Driver for Apple Ethernet Adapter --=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 (#40666): https://edk2.groups.io/g/devel/message/40666 Mute This Topic: https://groups.io/mt/31627857/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-