From patchwork Thu Apr 28 13:16:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 66899 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp210281qge; Thu, 28 Apr 2016 06:17:00 -0700 (PDT) X-Received: by 10.107.36.82 with SMTP id k79mr17858509iok.121.1461849420007; Thu, 28 Apr 2016 06:17:00 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k7si1089879igd.36.2016.04.28.06.16.59; Thu, 28 Apr 2016 06:16:59 -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 0F1BF6158A; Thu, 28 Apr 2016 13:16:59 +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 52D856158B; Thu, 28 Apr 2016 13:16:49 +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 7AB9B6158B; Thu, 28 Apr 2016 13:16:30 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by lists.linaro.org (Postfix) with ESMTPS id 3F9746157E for ; Thu, 28 Apr 2016 13:16:24 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id g17so40907515wme.1 for ; Thu, 28 Apr 2016 06:16:24 -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; bh=FHkeQsB/qG/eU0P9hhSFagXfXMpLSEGPAdRbDDQ5878=; b=AYPLarfpWn912qiUBAoa49REkLaXdazgCCUyP73WfcXfA8g9k9CbAPL2ecEt49SBY8 piClF8gpDHqpV/MvsnvJY4vCoC9iYcd7FH/rU/6vEtxO/mrCv9Mnml5LpDzmL0+8lXev XvmjiTUjUQdboVqZIVmmav0bxXVpJ5ybDF2lC0Us18wly/dqL1aWjwNCKwvvOPEYYOSK BFrCUXq9vAKTM3v0899B+rRpFTxP60jZPNYt3VZCxsMd9wE2ctQtMPr2yjKZ6QnXT5+E EEr9CDJ+6Ce3Cq8cuPGttZ/npBbxpHX/5MhfvCMnGPZBOliUlQbna0hC0Jy5AR3JAHd4 ENCw== X-Gm-Message-State: AOPr4FWsaWWMnlr4skbXqchNcnGc+eegOPxFbGbEjO1RshopqCSY96E11XySd/wrQfMb1c9kMgM= X-Received: by 10.28.18.81 with SMTP id 78mr15481176wms.59.1461849383251; Thu, 28 Apr 2016 06:16:23 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id o73sm35006187wme.16.2016.04.28.06.16.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 06:16:22 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, ricardo.salveti@linaro.org, leif.lindholm@linaro.org Date: Thu, 28 Apr 2016 15:16:19 +0200 Message-Id: <1461849379-22688-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH] Platforms/AMD/Styx: remove A PRIORI FDF sections for dynamic PCDs 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 default PcdLib resolution supports dynamic PCDs, and to do so, it depends on dynamic PCD related PPIs and protocols that are produced by the PEI and DXE versions of Pcd.inf, respectively. However, since these inherit this default resolution, Pcd.inf depends on protocols it produces itself, and can only be loaded forcefully using A PRIORI sections in the FDF. So instead, make Pcd.inf use the NULL PcdLib instance, so that it can be dispatches in the normal way. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc | 10 ++++++++-- Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf | 6 ------ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 10 ++++++++-- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 6 ------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc index bd4e23ddbf98..6b205bdd3631 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.dsc @@ -548,7 +548,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf MdeModulePkg/Core/Pei/PeiMain.inf - MdeModulePkg/Universal/PCD/Pei/Pcd.inf + MdeModulePkg/Universal/PCD/Pei/Pcd.inf { + + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } ArmPlatformPkg/PlatformPei/PlatformPeim.inf AmdModulePkg/Iscp/IscpPei.inf OpenPlatformPkg/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf @@ -569,7 +572,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } - MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { + + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } # # Architectural Protocols diff --git a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf index 9668372c0228..a8003e700fb8 100644 --- a/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf +++ b/Platforms/AMD/Styx/HuskyBoard/HuskyBoard.fdf @@ -85,9 +85,6 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - APRIORI DXE { - INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -246,9 +243,6 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - APRIORI PEI { - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - } INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index ae33f79f6f76..ceb1e60c621b 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -558,7 +558,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf MdeModulePkg/Core/Pei/PeiMain.inf - MdeModulePkg/Universal/PCD/Pei/Pcd.inf + MdeModulePkg/Universal/PCD/Pei/Pcd.inf { + + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } ArmPlatformPkg/PlatformPei/PlatformPeim.inf AmdModulePkg/Iscp/IscpPei.inf OpenPlatformPkg/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf @@ -579,7 +582,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } - MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { + + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } # # Architectural Protocols diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 7677718b76da..9583cbf1d32a 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -85,9 +85,6 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - APRIORI DXE { - INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -239,9 +236,6 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - APRIORI PEI { - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - } INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf