From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5E6EF7803CE for ; Fri, 24 May 2024 05:45:34 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=vF52pT/upI22P/WyTQ0Dad/4Zl3DkcZ2OfOCKy6RecY=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1716529532; v=1; b=Nn+FiAtqqYspHKRHE8bx2v6TAZy1XooW99XMr7bbKA7jY+mes7Fz5+sC13DizsZh2iVZhBQu KXCJzdhCsSxQfXrHIukw9e5N6JLurHZtQWHJBOPB/5KlYf/KRpkixCas6YdkZXZfyXSP/pM2aNo bp5T0WneGM/CtIyw6EQ4qlIQQxBwB3CwQRuK6+mzdh0Ztd3KNnNksxv0qm6pU2wyJph5Eo/4jxi WxRnRSGT9h31GwXnEQdtOzF1g1lxE+lSU2bEFiKL/q71WnkOJsiolEiXMl5EYikRTEMvjHfW+GO n2hfYGTnlXyIkxlatRhoQ/9cKysJhmGUKxBYtSSzHhpzg== X-Received: by 127.0.0.2 with SMTP id st2qYY7687511xFxsn0QOz1X; Thu, 23 May 2024 22:45:32 -0700 X-Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.9226.1716529531426015088 for ; Thu, 23 May 2024 22:45:31 -0700 X-Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6f4ed9dc7beso2152179b3a.1 for ; Thu, 23 May 2024 22:45:31 -0700 (PDT) X-Gm-Message-State: tQdf5fZB541X1hO5cngYaOdMx7686176AA= X-Google-Smtp-Source: AGHT+IHBR+tgrZDPOPGNLS1/pCj6Klrz1W7AVMdoKpGkv/o+GZ5MSnodou+upN7eAA1PAqPP3tBYSQ== X-Received: by 2002:a05:6a00:301c:b0:6f3:eb71:af90 with SMTP id d2e1a72fcca58-6f8e924aa5amr1989984b3a.4.1716529530724; Thu, 23 May 2024 22:45:30 -0700 (PDT) X-Received: from localhost.localdomain (c-67-160-15-86.hsd1.wa.comcast.net. [67.160.15.86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fcfe64a4sm471919b3a.158.2024.05.23.22.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 22:45:30 -0700 (PDT) From: "Doug Flick via groups.io" X-Google-Original-From: Flickdm To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann Subject: [edk2-devel] [PATCH v3 17/20] ArmVirtPkg/ArmVirtQemu: Permit the use of dynamic PCDs in PEI Date: Thu, 23 May 2024 22:45:09 -0700 Message-Id: <20240524054512.523329-18-douglas.flick@microsoft.com> In-Reply-To: <20240524054512.523329-1-douglas.flick@microsoft.com> References: <20240524054512.523329-1-douglas.flick@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 23 May 2024 22:45:31 -0700 Resent-From: dougflick@microsoft.com Reply-To: devel@edk2.groups.io,dougflick@microsoft.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=Nn+FiAtq; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ard Biesheuvel Currently, only TPM2 builds enable the PCD PEIM, which is a prerequisite for being able to use dynamic PCDs already at the PEI stage. This facility will be used for other reasons too so move those pieces out of code block that are conditional on TPM2_ENABLE Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Committed-by: Ard Biesheuvel Signed-off-by: Doug Flick [MSFT] --- ArmVirtPkg/ArmVirtQemu.dsc | 6 +----- ArmVirtPkg/ArmVirtQemu.fdf | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 1d3315ad3e..4498ca58a8 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -318,11 +318,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVar= iableGuid|0x0|5=0D =0D [LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D -!else=0D - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf=0D -!endif=0D =0D ##########################################################################= ######=0D #=0D @@ -339,11 +335,11 @@ ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf=0D ArmPkg/Drivers/CpuPei/CpuPei.inf=0D =0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Universal/PCD/Pei/Pcd.inf {=0D =0D PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf=0D }=0D +!if $(TPM2_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {=0D =0D ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVi= rtPsciResetSystemPeiLib.inf=0D diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 764f652afd..6073a31970 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -111,8 +111,8 @@ READ_LOCK_STATUS =3D TRUE INF ArmPkg/Drivers/CpuPei/CpuPei.inf=0D INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf=0D =0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf=0D +!if $(TPM2_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf=0D INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D --=20 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119244): https://edk2.groups.io/g/devel/message/119244 Mute This Topic: https://groups.io/mt/106276869/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-