From patchwork Tue May 10 12:11:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67438 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2091020qge; Tue, 10 May 2016 05:12:44 -0700 (PDT) X-Received: by 10.55.99.214 with SMTP id x205mr42392010qkb.3.1462882364536; Tue, 10 May 2016 05:12:44 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x67si1183434qhe.81.2016.05.10.05.12.44; Tue, 10 May 2016 05:12:44 -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 2A9CC6166D; Tue, 10 May 2016 12:12: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 2F82661103; Tue, 10 May 2016 12:12:12 +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 8492661586; Tue, 10 May 2016 12:12:05 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by lists.linaro.org (Postfix) with ESMTPS id 8D179611FB for ; Tue, 10 May 2016 12:12:03 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id e201so175172320wme.0 for ; Tue, 10 May 2016 05:12:03 -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=mTTUIu31qM1TmYxnoQRq9mRa7e1zFfwB/g8zzMDKTUE=; b=O+4CgOwLBJuS8RBGOT5NslgiLyhoi/j0YDH1PXHbkeuAmCR2KIJmwxg3bf3a/Y7wHP liTxiYngcwjPwUtrNE8Cyp3bZhR22vZAGT8pHyB2jypwAkcSE9rtX2am2PzReXOHx+R9 L852aQ4nyzu7FH7mTqoRHp7tMBSE9PpVtgMojBCca7D8oRBrQbV0gqvkQP+i+5cC7jzU As7NQYowFIMP7YdvCjVB/qQZqr6ppYBbuCjQPGbhwlZn1Y9lRCvLF2kMXi0ZbPZQlkAH iToWa4aeHnXXspE/+CnCWQgwfvhTc34RlIRUolzKXz96u+W4h/3w3FZBRBlEk5wjaEsW S3rA== X-Gm-Message-State: AOPr4FVPwFNAoQvU2aF7cv/M9/Zve0s2qyoeLvAvijettuAgdiKMroAmZzES3A/9ONrrLJW1T6Q= X-Received: by 10.194.192.8 with SMTP id hc8mr39685676wjc.87.1462882322768; Tue, 10 May 2016 05:12:02 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id m20sm2623084wma.23.2016.05.10.05.12.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 05:12:01 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 10 May 2016 14:11:41 +0200 Message-Id: <1462882313-7637-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462882313-7637-1-git-send-email-ard.biesheuvel@linaro.org> References: <1462882313-7637-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH 02/14] Platforms/AMD/Styx/CelloBoard.dsc: remove bogus 'if $(DO_PSCI)' 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" The patch that conditionally switches to the unicore PrePeiCore tests a define that does not exist on Cello. So remove it, and always use the unicore version (like we now do on Overdrive as well) Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 4 ---- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index b36eeb838c77..fcdffbd278b5 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -546,11 +546,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/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 3fc128e14c4d..3af47ef4c5b6 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -239,11 +239,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