From patchwork Sat Jan 31 09:29:25 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: 44075 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B70A42359E for ; Sat, 31 Jan 2015 09:31:06 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id m14sf13065635wev.3 for ; Sat, 31 Jan 2015 01:31:06 -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=z3HIbdtjALbuK2Q6kgYOGldkkU9a0Z4cjXQvMJzJrL4=; b=Xir4cGMGNnlB2M4k6Jn2V43uj+qJ3a0tUPt/P//xIus19SLEo7keji5KTf3uU/QhZ0 HlZMbCY8FW8xatrhr/INYgm3NTF8LjiifuwOIUm9/I13LxUeRZV9x8eEid5Q/QHrN9DW g68w4PbnsDiiMNBk8CxhLA3DzYh3Xdsc1k34iHrBBqAUSEhyX824j7cuZ0VS5UUu9SwJ eBEGSzo6IwTMAao1MvDwwi/k7aZ1/XTfFiNnQSHqbuhu4TgP3is8W3hbonNZa7IcBrAB 3oYvCseAKaAkIlBfJJmID8PY9LjJvzix5swNq2v33r+iL06Td/JaKZUU5pYccH6EnyRn UX6w== X-Gm-Message-State: ALoCoQkU8EYhQM/fJHUEiSeeL+5wCbZzclePIrw94FOwpSsG0Y888lPvLhojBC70rTiBN1fIUeGN X-Received: by 10.112.175.10 with SMTP id bw10mr1322943lbc.7.1422696665956; Sat, 31 Jan 2015 01:31:05 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.230 with SMTP id jr6ls522262lab.69.gmail; Sat, 31 Jan 2015 01:31:05 -0800 (PST) X-Received: by 10.112.220.36 with SMTP id pt4mr10072627lbc.15.1422696665670; Sat, 31 Jan 2015 01:31:05 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id ql3si11934297lbb.133.2015.01.31.01.31.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 31 Jan 2015 01:31:05 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id s18so28060656lam.3 for ; Sat, 31 Jan 2015 01:31:05 -0800 (PST) X-Received: by 10.112.181.41 with SMTP id dt9mr10229334lbc.56.1422696665549; Sat, 31 Jan 2015 01:31:05 -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 h5csp177413lbj; Sat, 31 Jan 2015 01:31:04 -0800 (PST) X-Received: by 10.107.154.17 with SMTP id c17mr12074994ioe.74.1422696660292; 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 c140si3393339ioc.41.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-0005Na-Kb; 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 1YHUO5-0005N8-Ol for edk2-devel@lists.sourceforge.net; Sat, 31 Jan 2015 09:30:45 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.220.46 as permitted sender) client-ip=209.85.220.46; envelope-from=fu.wei@linaro.org; helo=mail-pa0-f46.google.com; Received: from mail-pa0-f46.google.com ([209.85.220.46]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YHUO3-0002cC-Sl for edk2-devel@lists.sourceforge.net; Sat, 31 Jan 2015 09:30:45 +0000 Received: by mail-pa0-f46.google.com with SMTP id lj1so61947595pab.5 for ; Sat, 31 Jan 2015 01:30:38 -0800 (PST) X-Received: by 10.66.65.138 with SMTP id x10mr15062836pas.74.1422696638234; Sat, 31 Jan 2015 01:30:38 -0800 (PST) Received: from localhost.localdomain ([203.175.172.123]) by mx.google.com with ESMTPSA id pp6sm13030773pdb.92.2015.01.31.01.30.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Jan 2015 01:30:37 -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:25 +0800 Message-Id: <1422696566-21807-5-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: -0.9 (/) 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.6 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YHUO3-0002cC-Sl Subject: [edk2] [PATCH v3 4/5] ArmPlatformPkg: Add conditionalised networking support for RTSM A15 MPcore 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.44 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_MPCore.dsc | 4 ++++ .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf | 21 +++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc index 2a81c85..debff64 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc @@ -27,6 +27,10 @@ SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.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_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf index b2be83b..554faad 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.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) #