From patchwork Fri Apr 29 17:58:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 66963 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp926939qge; Fri, 29 Apr 2016 11:01:45 -0700 (PDT) X-Received: by 10.107.9.102 with SMTP id j99mr26170528ioi.104.1461952905531; Fri, 29 Apr 2016 11:01:45 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b142si2079489ioe.115.2016.04.29.11.01.45; Fri, 29 Apr 2016 11:01:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 01602615DF; Fri, 29 Apr 2016 18:01:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0FA0F615FB; Fri, 29 Apr 2016 18:01:00 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3BE24615F5; Fri, 29 Apr 2016 18:00:52 +0000 (UTC) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by lists.linaro.org (Postfix) with ESMTPS id 6EF7A615FD for ; Fri, 29 Apr 2016 17:59:05 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id n129so37148222wmn.1 for ; Fri, 29 Apr 2016 10:59:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lX3tZH9BZVLeRXTcaBnmRPFa6LOS0hUePJcILGTfnTE=; b=X+QpO0cbv7QCk7Fu4ffR1GT/ezO/plf8+6efaoxwOs8TdmVUBtgN8e6WuwgmrZ577P nnPpqDV2Iaq4cHJiCjUJY8EGn4EBPS1mhDc1xMthTbLK52KNZfaT0bMhXA5qpMaCSnV4 o6DTBTmiPKrW8TZdZsdQAkQre1OakfHjjDZGNADgiODw4YaLMkcb506H6PL/seVWXLfX CK1Zypp2xki2eJRyhc4vRY8yAEOsZcmQPPTho+gOVIGpMmAeF54WAOqrz+VX+0yrhu4/ yA9TR7vcjM453pjK5Qlu/jJtTK7EMz2I8vg6JFHGIVd9QXpSLrRLLOhGJ3DQ7F9vlDWN B/fw== X-Gm-Message-State: AOPr4FUHdTgfkEFeMtIrYaJ0BxBaWA7D1S8opVdBGMpitF5wNgtV6MVxKcsgfo87ZF52wUxnRCA= X-Received: by 10.28.39.5 with SMTP id n5mr5556380wmn.13.1461952744535; Fri, 29 Apr 2016 10:59:04 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id m140sm4340004wma.24.2016.04.29.10.59.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Apr 2016 10:59:03 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, ricardo.salveti@linaro.org, leif.lindholm@linaro.org Date: Fri, 29 Apr 2016 19:58:58 +0200 Message-Id: <1461952739-31629-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1461952739-31629-1-git-send-email-ard.biesheuvel@linaro.org> References: <1461952739-31629-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH 2/3] Platforms/AMD/Styx: use unicore PrePei driver if PSCI is enabled X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" When building the firmware with PSCI support, only the primary core enters UEFI, and the secondaries remain under the control of the EL3 firmware until the moment the OS invokes PSCI methords to release them. This means we can use the UP variant or PrePeiCore in this case. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 4 ++++ Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 4 ++++ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 4 ++++ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index a60e09682df4..2e8cbffd80c9 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -547,7 +547,11 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # PEI Phase modules # +!if $(DO_PSCI) + ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif MdeModulePkg/Core/Pei/PeiMain.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf { diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index 6cb89d394010..5543b08b2dc9 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -248,7 +248,11 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE +!if $(DO_PSCI) + INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF AmdModulePkg/Iscp/IscpPei.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index bbb6b9edcbaf..e4ece5e23218 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -558,7 +558,11 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # PEI Phase modules # +!if $(DO_PSCI) + ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif MdeModulePkg/Core/Pei/PeiMain.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf { diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index d0fb9000e2a2..263a267fbae7 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -247,7 +247,11 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE +!if $(DO_PSCI) + INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +!else INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +!endif INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf INF AmdModulePkg/Iscp/IscpPei.inf