From patchwork Fri Dec 20 19:37:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 22698 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CEB522054F for ; Fri, 20 Dec 2013 19:37:24 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id fa1sf7757458pad.5 for ; Fri, 20 Dec 2013 11:37:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=vxohM07rRSh/vD/wTZoktmWEsq0tc1BxMDTbTEzJSAc=; b=jV/NQt64OEtWorpZsM8UTYstg7+8UZuKq7JCysLZK3LpZ78PGgFlhNw7j1w4tuEtGm ouHJ41lw/JB4RIsK/leqEzHrt9nK9KSyiLp6qpGf4vM5Bs816vIf517E4SZOq3+wp+Sw mARaXZqDD9bya/Gdm/RHmiwKpK1xnvTsakTfD3icGARn1M+bz/zKfSmWuY3nNTeuGJ+z 7BMyBJqyh55oXa1lC1BbZ3WhsrulRdV0IoDDeQaFiNiOyshdTiJRtRkz2zwMezDByQMX ft0oK3JskchFZvJrre/vYFJAoowuzVcdOJkkhBglDlxaOMKpK4cNC7i+++Xjx42V0dcN Ykxw== X-Gm-Message-State: ALoCoQl+vlyI6UmChFbdwRO1FRCTEE1jGIsfU7OrWSGLmZD8GYcSBV+ilAtdxdprEsSLhaGWQZ+3 X-Received: by 10.68.201.7 with SMTP id jw7mr4211969pbc.8.1387568243630; Fri, 20 Dec 2013 11:37:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.61.229 with SMTP id t5ls864567qer.53.gmail; Fri, 20 Dec 2013 11:37:23 -0800 (PST) X-Received: by 10.220.192.198 with SMTP id dr6mr2425031vcb.19.1387568243482; Fri, 20 Dec 2013 11:37:23 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id t2si1728028vem.66.2013.12.20.11.37.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 11:37:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ij19so1721584vcb.3 for ; Fri, 20 Dec 2013 11:37:23 -0800 (PST) X-Received: by 10.220.174.200 with SMTP id u8mr6147562vcz.6.1387568243353; Fri, 20 Dec 2013 11:37:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp85516ved; Fri, 20 Dec 2013 11:37:22 -0800 (PST) X-Received: by 10.68.66.103 with SMTP id e7mr10593134pbt.120.1387568242246; Fri, 20 Dec 2013 11:37:22 -0800 (PST) Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by mx.google.com with ESMTPS id ph10si5975634pbb.259.2013.12.20.11.37.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 11:37:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of roy.franz@linaro.org) client-ip=209.85.160.46; Received: by mail-pb0-f46.google.com with SMTP id md12so2977392pbc.5 for ; Fri, 20 Dec 2013 11:37:21 -0800 (PST) X-Received: by 10.68.191.106 with SMTP id gx10mr10725094pbc.47.1387568241582; Fri, 20 Dec 2013 11:37:21 -0800 (PST) Received: from rfranz-i7.local (c-24-10-97-91.hsd1.ca.comcast.net. [24.10.97.91]) by mx.google.com with ESMTPSA id sy10sm21064013pac.15.2013.12.20.11.37.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Dec 2013 11:37:20 -0800 (PST) From: Roy Franz To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org, olivier.martin@arm.com Cc: patches@linaro.org, ryan.harkin@linaro.org, Roy Franz Subject: [PATCH] Add build option to support QEMU VExpress networking Date: Fri, 20 Dec 2013 11:37:14 -0800 Message-Id: <1387568234-23407-1-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The RTSM VExpress model emulates a different networking controller (91C111) than the VExpres board (9118). QEMU emulates the 9118 which matches the real hardare. This is the only configuration difference for UEFI between building for RTSM or UEFI. This patch adds a EDK2_ARMVE_USE_9118 macro that can be defined at build time that can be used to build an image that supports QEMU. The default build is unchanged and builds the RTSM configuration. Signed-off-by: Roy Franz Contributed-under: TianoCore Contribution Agreement 1.0 --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 12 +++++++++--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 8 +++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc index 4dcdfae..5323efd 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc @@ -141,9 +141,15 @@ gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000 - # Ethernet (SMSC 91C111) - gArmPlatformTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x1A000000 - + # Select network device based on build time macro +!if $(EDK2_ARMVE_USE_9118) == 1 + # Ethernet (SMSC 9118, for QEMU, matches real hardware) + gArmPlatformTokenSpaceGuid.PcdLan9118DxeBaseAddress|0x1A000000 +!else + # Ethernet (SMSC 91C111, for RTSM) + gArmPlatformTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x1A000000 +!endif + # # ARM OS Loader # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf index be79efd..146f6f4 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf @@ -144,7 +144,13 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf - INF ArmPlatformPkg/Drivers/LAN91xDxe/LAN91xDxe.inf +!if $(EDK2_ARMVE_USE_9118) == 1 + # LAN9118Dxe.inf for QEMU (matches use of 9118 on real VExpress board) + INF ArmPlatformPkg/Drivers/LAN9118Dxe/LAN9118Dxe.inf +!else + # LAN91xDxe.inf for RTSM + INF ArmPlatformPkg/Drivers/LAN91xDxe/LAN91xDxe.inf +!endif # # Multiple Console IO support