From patchwork Mon May 2 13:35:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67030 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp47367qge; Mon, 2 May 2016 06:37:30 -0700 (PDT) X-Received: by 10.140.108.247 with SMTP id j110mr16751843qgf.54.1462196250328; Mon, 02 May 2016 06:37:30 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 137si1071876qhr.116.2016.05.02.06.37.30; Mon, 02 May 2016 06:37:30 -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 F18DD61607; Mon, 2 May 2016 13:37:29 +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 F008961611; Mon, 2 May 2016 13:36:21 +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 2E64561604; Mon, 2 May 2016 13:36:11 +0000 (UTC) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by lists.linaro.org (Postfix) with ESMTPS id D02A061606 for ; Mon, 2 May 2016 13:36:02 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id n129so107711676wmn.1 for ; Mon, 02 May 2016 06:36:02 -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=pCgZB0uX/p5D1TTPi64r/24LahZogCQTOxwCScr8slk=; b=ChhI6LZx4j3dCLxf94VQNRPpRpS61YbfwY4w5uJqTb5Y3JiU9r2VljsUp3uuYAROVc L0Me1S5YuuFlsyX9J+3oqbYl32CjgUKclbjuYMyVY3mi7AJ0yagCgsqie5+xtNK//Yab mYkPyS5Q/YA0JhsnwHwuQzwnhaO8oO3DW/gW7Aeq/DUlIla92dduujiCfcDggtKT+oB1 5EfwKoVj29nRhuFu6rlj61mQgBjzIekJ3BQew2MuGnNPDILooYD5XbFpKCme7e0eLTi7 ePtjc+ENp2FK13e8tVhk3k16RG+BEYn5KhPtaXkDG1+aYFYcTEbLT+JO/2csNA3uqYjE CCRg== X-Gm-Message-State: AOPr4FWa2mIELX+FFZ0z3ucUxHkl/XzYgwW2CXXQieKuwzuEqpx8tqYuL2wtPAerrxn85Oqci6M= X-Received: by 10.194.84.2 with SMTP id u2mr36316150wjy.61.1462196161610; Mon, 02 May 2016 06:36:01 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id d1sm30424544wjb.47.2016.05.02.06.36.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 May 2016 06:36:00 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Mon, 2 May 2016 15:35:43 +0200 Message-Id: <1462196143-21998-8-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462196143-21998-1-git-send-email-ard.biesheuvel@linaro.org> References: <1462196143-21998-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [RFC PATCH 7/7] Platforms/ARM/Overdrive: move to PrePeiCoreUnicore even on non-PSCI builds 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" Since we are no longer booting the secondaries into SEC and PEI, switch to the unicore PrePeiCore unconditionally. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 4 ---- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index e4ece5e23218..7a88c95bc5d1 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -558,11 +558,7 @@ 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 263a267fbae7..8d70e9d7c462 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -247,11 +247,7 @@ 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