From patchwork Sat Jan 31 09:29:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 44073 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E259A2359E for ; Sat, 31 Jan 2015 09:31:02 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e49sf12987482eek.3 for ; Sat, 31 Jan 2015 01:31:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=6oza3fvFbRF1VePPpSh7b4FfjZZQJtzdMmAiSm0FdpA=; b=M6/cj7uyYWvMCllEVst4iAny6vUpAAOvH0VRNnvGseTrR6DgNW7fF4xaWtS65dGstw D9iP9XH56Wdj92oT6E0Srav3rAQZ/kFi6Vyrm3uu6716vgPnTTMNddFDDfh8elQCQnMG +ywH8qnfl7LmxIjdRHfa8X9xWfC5Ii09uNiIdrHMDvlnvJ5M8Ekddl/64VWHpXTJT/LI RtvXeYHCYx+d3WsQJLamhuf0ZifuOk5piyCXf0GpVJn0T4VZ2Bm04kIYS5ti9sJ7VegU ZChk2GNiAcljKeBdvK1B3zADO1qC5RwumeM0bq4aKqJAZheATkPmYOx7sSHbeNJyvPem Cd7Q== X-Gm-Message-State: ALoCoQlXLaHTWWpOoWrCmnGfiObQFEN3eECib09uXQvUiNIJxt3iq1Yf+aSxlxUMC+KN9mw7OP3Y X-Received: by 10.152.28.71 with SMTP id z7mr122200lag.7.1422696662007; Sat, 31 Jan 2015 01:31:02 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.169 with SMTP id x9ls518112lad.72.gmail; Sat, 31 Jan 2015 01:31:01 -0800 (PST) X-Received: by 10.112.72.197 with SMTP id f5mr10194839lbv.21.1422696661785; Sat, 31 Jan 2015 01:31:01 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id yi9si11966748lbb.13.2015.01.31.01.31.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 31 Jan 2015 01:31:01 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id pv20so27868300lab.7 for ; Sat, 31 Jan 2015 01:31:01 -0800 (PST) X-Received: by 10.152.116.43 with SMTP id jt11mr10387380lab.69.1422696661620; Sat, 31 Jan 2015 01:31:01 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp177386lbj; Sat, 31 Jan 2015 01:31:00 -0800 (PST) X-Received: by 10.43.126.67 with SMTP id gv3mr10397178icc.31.1422696660504; Sat, 31 Jan 2015 01:31:00 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id g3si3383250igr.23.2015.01.31.01.30.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 31 Jan 2015 01:31:00 -0800 (PST) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YHUO8-0005Ng-OH; Sat, 31 Jan 2015 09:30:48 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YHUO7-0005NI-QE for edk2-devel@lists.sourceforge.net; Sat, 31 Jan 2015 09:30:47 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.220.48 as permitted sender) client-ip=209.85.220.48; envelope-from=fu.wei@linaro.org; helo=mail-pa0-f48.google.com; Received: from mail-pa0-f48.google.com ([209.85.220.48]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YHUO6-0002cF-V4 for edk2-devel@lists.sourceforge.net; Sat, 31 Jan 2015 09:30:47 +0000 Received: by mail-pa0-f48.google.com with SMTP id ey11so62056745pad.7 for ; Sat, 31 Jan 2015 01:30:41 -0800 (PST) X-Received: by 10.66.65.195 with SMTP id z3mr15142068pas.104.1422696641374; Sat, 31 Jan 2015 01:30:41 -0800 (PST) Received: from localhost.localdomain ([203.175.172.123]) by mx.google.com with ESMTPSA id pp6sm13030773pdb.92.2015.01.31.01.30.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 01:30:40 -0800 (PST) From: fu.wei@linaro.org To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org Date: Sat, 31 Jan 2015 17:29:26 +0800 Message-Id: <1422696566-21807-6-git-send-email-fu.wei@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1422696566-21807-1-git-send-email-fu.wei@linaro.org> References: <=fu.wei@linaro.org> <1422696566-21807-1-git-send-email-fu.wei@linaro.org> X-Spam-Score: -1.0 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.5 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YHUO6-0002cF-V4 Subject: [edk2] [PATCH v3 5/5] ArmPlatformPkg: Add conditionalised networking support for RTSM A15 X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: fu.wei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Fu Wei Delete original network protocol support files. Those files have been integrated into ArmVExpress-networking.fdf.inc Add support for including the SMSC LAN 91C111 driver support and ArmVExpress-networking.fdf.inc by default(EDK2_ENABLE_SMSC_91X=1). If specify "-D EDK2_ENABLE_SMSC_91X=0" build variable, the networking support will be disabled. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Wei --- .../ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 4 ++++ .../ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 21 +++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc index 78f4077..1e84d20 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc @@ -27,6 +27,10 @@ SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf +!ifndef EDK2_ENABLE_SMSC_91X + DEFINE EDK2_ENABLE_SMSC_91X=1 +!endif + !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc [LibraryClasses.common] diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf index 547f8cf..a8aceac 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf @@ -129,22 +129,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf # - # 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/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/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf - - # # Multiple Console IO support # INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf @@ -187,6 +171,11 @@ READ_LOCK_STATUS = TRUE INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf +!if $(EDK2_ENABLE_SMSC_91X) != 0 +!include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc + INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf +!endif + # # UEFI application (Shell Embedded Boot Loader) #