From patchwork Thu Jan 15 17:21:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 43220 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EECB320D60 for ; Thu, 15 Jan 2015 17:21:52 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id k11sf8590770wes.2 for ; Thu, 15 Jan 2015 09:21:52 -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=QGda/LutSRyXuGsYHXAgAWky+wJGaLKCFCPYfAe4Hag=; b=Vmddc8TgeANbsKM3rgXbyz52v6l6ZLfrla0fM8HMm5Fv0zwaVvMpWOwmgnPQ7aLhSY 89o5b6CylqRpo6DvWPHyeIS61DRafEFFzpd69PEdbIM3/JDMdHFEmgxJCOwVc2IpTMa0 5HEXpq4OPabv0JpKScdNor0ts25EzjqYUqGJ1wGiy/HKfhekGH6E+Z7Rx0NC5URWgEEK UP+sQvPhv15ZAQRpoEFrA81VZXkyLcABT0rpjwUo9SesP4CreluWG75lkTZOpjxxYohH WBiEtGV1aBDrC7YrfVRPfWIH1ZiTVnNyfrnUqv6zGyj2z95bQ8DoO9uE7l44Lz5hrKwQ QYHQ== X-Gm-Message-State: ALoCoQm7/8vSK4JGZ3sl7u7T+hHXL1BL96jvkHswk68wXTdJ66VpUj62YzXhHOqUEIPFQa/6mKgp X-Received: by 10.112.114.162 with SMTP id jh2mr486661lbb.9.1421342512231; Thu, 15 Jan 2015 09:21:52 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.11.6 with SMTP id ee6ls275074lad.7.gmail; Thu, 15 Jan 2015 09:21:52 -0800 (PST) X-Received: by 10.152.4.233 with SMTP id n9mr11176476lan.61.1421342512088; Thu, 15 Jan 2015 09:21:52 -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 j5si2003377laf.99.2015.01.15.09.21.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:51 -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 gd6so14890510lab.3 for ; Thu, 15 Jan 2015 09:21:51 -0800 (PST) X-Received: by 10.152.18.135 with SMTP id w7mr10793662lad.47.1421342511658; Thu, 15 Jan 2015 09:21:51 -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.9.200 with SMTP id c8csp51153lbb; Thu, 15 Jan 2015 09:21:49 -0800 (PST) X-Received: by 10.107.160.135 with SMTP id j129mr2764998ioe.91.1421342499164; Thu, 15 Jan 2015 09:21:39 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id ga10si4951342igd.13.2015.01.15.09.21.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:39 -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-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6t-0001AA-Hr; Thu, 15 Jan 2015 17:21:31 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6s-00019w-BP for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:30 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; envelope-from=leif.lindholm@linaro.org; helo=mail-wi0-f176.google.com; Received: from mail-wi0-f176.google.com ([209.85.212.176]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YBo6r-0003fP-Di for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:30 +0000 Received: by mail-wi0-f176.google.com with SMTP id z2so10911531wiv.3 for ; Thu, 15 Jan 2015 09:21:23 -0800 (PST) X-Received: by 10.180.212.113 with SMTP id nj17mr58713595wic.77.1421342483465; Thu, 15 Jan 2015 09:21:23 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id gf9sm2883968wjc.0.2015.01.15.09.21.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jan 2015 09:21:22 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org Date: Thu, 15 Jan 2015 17:21:48 +0000 Message-Id: <1421342508-13347-6-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1421342508-13347-1-git-send-email-leif.lindholm@linaro.org> References: <1421342508-13347-1-git-send-email-leif.lindholm@linaro.org> X-Spam-Score: -1.5 (-) 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.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YBo6r-0003fP-Di Subject: [edk2] [PATCH v2 5/5] ArmPlatformPkg: enable use of IntelBds on Juno 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: leif.lindholm@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 Select IntelBds instead of the ARM Bds when building with -D INTEL_BDS. This also updates ArmJunoDxe to use ArmBdsHelperLib instead of the BdsLib directly. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc | 19 +++++++++++++++++++ ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf | 6 ++++++ .../ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 2 +- .../ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc index c962856..c42854e 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc @@ -39,6 +39,14 @@ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf + ArmBdsHelperLib|ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf +!ifdef INTEL_BDS + CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf + GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf + PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf + CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf +!endif + # USB Requirements UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf @@ -146,6 +154,11 @@ gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|50000000 gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000 +!ifdef INTEL_BDS + gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } +!endif + [PcdsPatchableInModule] # Console Resolution (Full HD) gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1920 @@ -236,5 +249,11 @@ # Bds # MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!ifdef INTEL_BDS + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +!else ArmPlatformPkg/Bds/Bds.inf +!endif diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf index 34b190d..96a80a7 100644 --- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf +++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf @@ -171,7 +171,13 @@ READ_LOCK_STATUS = TRUE # Bds # INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!ifdef INTEL_BDS + INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +!else INF ArmPlatformPkg/Bds/Bds.inf +!endif [FV.FVMAIN_COMPACT] FvAlignment = 8 diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index bf930d2..2b23ab4 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -32,9 +32,9 @@ MdePkg/MdePkg.dec [LibraryClasses] + ArmBdsHelperLib ArmShellCmdRunAxfLib BaseMemoryLib - BdsLib DebugLib DmaLib DxeServicesTableLib diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c index a4220a1..4ccd5d3 100644 --- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c +++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c @@ -19,8 +19,8 @@ #include #include +#include #include -#include #include #include #include