From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+90914+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90914+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1656540730; cv=none; d=zohomail.com; s=zohoarc; b=MudlkQCylpgtaPWGp3z8ivWo6Vey0SqqXsz4l9ESm2AHSOjy2AQ78C88WORRbQnqKvGUfgQ8rkT35SmZ9y8RSb1QFtx+dWSjB/fwi5vX4LZSC3Xc75Fm7q6tuP0vR6Cd8XyacESUxTtumCkz3j5Zo3nf7JVxmqCt42ZL792DcsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656540730; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ghSSlMRtPRd2KHqaTE+knNl+6OfrixaJMiUg9UTyHl0=; b=eL6TCXUJZa0EBcrByGQVvCrczRe5uCmy2Nd3n/vsKizanswrUJVosnWVBSfxEJqXO/U7eznzML8U3jyaPtMAbn6N0KY4gFT/ByNqJtG4nMUVjsNK/uLYP66sh/TDjqSyqYBlsssHASRn4UwOVjBm1/Sdg68d02ikYp4/TACkQkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90914+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1656540730453176.0032004516537; Wed, 29 Jun 2022 15:12:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aPt7YY1788612xCNjszuZmvz; Wed, 29 Jun 2022 15:12:10 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.17690.1656540729615814448 for ; Wed, 29 Jun 2022 15:12:09 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10393"; a="262578738" X-IronPort-AV: E=Sophos;i="5.92,232,1650956400"; d="scan'208";a="262578738" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 15:11:48 -0700 X-IronPort-AV: E=Sophos;i="5.92,232,1650956400"; d="scan'208";a="767768817" X-Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 15:11:48 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Chasel Chiu , Nate DeSimone , Liming Gao , Eric Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 1/2] MinPlatformPkg/Build: Add NOOPT build Date: Wed, 29 Jun 2022 15:11:37 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,isaac.w.oram@intel.com X-Gm-Message-State: 4QwIOReEgg7jn2SJVWrQyu27x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656540730; bh=vkoystThkmTbczmrOG69TiAEA9tcvo/GjTwMqkEgqGw=; h=Cc:Date:From:Reply-To:Subject:To; b=qqczJy3VIG/QmzdRybJ2bd7/YKtRhHHYpEjNdiXhAJ4HOaOiDhbtR6z8rhM4H5ZAvID vziRlIGGi/F8I73uQLAmo1ee8Q+mwwMvrTqG9FYwvEwqJal8gK4Yx8javu+kfCduM7C4N NyD/m6rPMFGty/YsMBdpsH9J72gsUeo9kXI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656540730705100001 Content-Type: text/plain; charset="utf-8" Add NOOPT build support to enable easy debugging of unoptimized code. Generally the same libraries are desired for DEBUG and NOOPT. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 11 +++++------ .../Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 4 ++-- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Pla= tform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 209ccdaf54..9b3095d662 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -50,6 +50,11 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRunt= imeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRu= ntimeVariableWriteLib.inf =20 +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] +!if $(TARGET) !=3D RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf +!endif + [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeC= oreMemoryAllocationLib.inf @@ -59,9 +64,6 @@ PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) =3D=3D DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif =20 [LibraryClasses.common.DXE_DRIVER] @@ -109,9 +111,6 @@ PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerform= anceLib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif - -!if $(TARGET) =3D=3D DEBUG - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif =20 [LibraryClasses.common.DXE_RUNTIME_DRIVER] diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Pla= tform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index c12189bd9a..1bf8338f95 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -37,7 +37,7 @@ [LibraryClasses.common.SEC] ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf -!if $(TARGET) =3D=3D DEBUG +!if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf @@ -46,7 +46,7 @@ [LibraryClasses.common.PEI_CORE] TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf -!if $(TARGET) =3D=3D DEBUG +!if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf !endif =20 diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dsc index a8373a4ecb..09aa6fe4d5 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc @@ -20,7 +20,7 @@ DSC_SPECIFICATION =3D 0x00010005 OUTPUT_DIRECTORY =3D Build/MinPlatformPkg SUPPORTED_ARCHITECTURES =3D IA32|X64 - BUILD_TARGETS =3D DEBUG|RELEASE + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 ##########################################################################= ###### --=20 2.36.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90914): https://edk2.groups.io/g/devel/message/90914 Mute This Topic: https://groups.io/mt/92075456/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+90915+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90915+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1656540731; cv=none; d=zohomail.com; s=zohoarc; b=ldZQtMwngJIV2Zj34kk5LgR7gWNEbDb3AEHinJEXN9HGZFPANBc0wz8mCaJP++QjIyTWDQbsQATyurKuF3MQpjFF5YVAc/JdNOig12ginCaWw3w/Ai5k65mRiGglaRFSV8A6ERSAE0UE/o39uqFF+C3/SgOCjazUoPTkT7QAdeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656540731; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=u0hefmOr3Jc3L1varBA1BnVWJlusAagIfffe2M2zKz8=; b=j16/IaT7BxFoDt07wfjLoSvDOPgiIlVcaAXCQGsd5y05Swbw+VuoIl3H1xJQBJsDEQGHOi0l53cQe44+/WNoDmGOHMYV+uGXg44jsdnTXzCg/Y/s1NarSMXOLqyj0RGs9QN08WKsFA/84TbAMXL3ENxiEEBrEAt8RyuF+faqirY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90915+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1656540731376481.8246392968938; Wed, 29 Jun 2022 15:12:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7NaeYY1788612x4okHsp4crz; Wed, 29 Jun 2022 15:12:11 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.17690.1656540729615814448 for ; Wed, 29 Jun 2022 15:12:10 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10393"; a="262578739" X-IronPort-AV: E=Sophos;i="5.92,232,1650956400"; d="scan'208";a="262578739" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 15:11:48 -0700 X-IronPort-AV: E=Sophos;i="5.92,232,1650956400"; d="scan'208";a="767768826" X-Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 15:11:48 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Chasel Chiu , Nate DeSimone , Liming Gao , Eric Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 2/2] MinPlatformPkg/Build: Reduce duplication Date: Wed, 29 Jun 2022 15:11:38 -0700 Message-Id: <31499f57e5001e64fe2f54f9cae90bbc6aa4e984.1656539669.git.isaac.w.oram@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,isaac.w.oram@intel.com X-Gm-Message-State: gxX18VQf6gqYfBLRblTvFilvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656540731; bh=BPrG9EBvDz8LanO0+2vMZWLi7kWCTuF4yTMekHA28co=; h=Cc:Date:From:Reply-To:Subject:To; b=TBTwmkewMvfH2cJbN0CIvHtSSbkD/EX/xmPXWdxM/3tqEzDA/kcq42xS/d0Sy0aHYtd Ohva/kqZTPgQZG1TcBIkjBUQa2YKrobEmGqUjjtAtn4SAc8talFlfFmtDcoNfwAEtcxsu 8JcPWbs/saqn7dQOmOvk8/iYE0J1w9P/sX4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656540732782100007 Content-Type: text/plain; charset="utf-8" Removed needless duplication between sections. Addes spaces after commas. Remove commented out code. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram --- .../MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 55 +++++-------------- .../MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 29 +++------- 2 files changed, 20 insertions(+), 64 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc b/Pla= tform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc index 9b3095d662..6a4d586ddf 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc @@ -8,14 +8,14 @@ ## =20 =20 - # - # Generic EDKII Lib - # +# +# Generic EDKII Lib +# =20 - # - # DXE phase common - # -[LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,Libra= ryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.c= ommon.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.c= ommon.UEFI_APPLICATION] +# +# DXE phase common +# +[LibraryClasses.common.DXE_CORE, LibraryClasses.common.DXE_SMM_DRIVER, Lib= raryClasses.common.SMM_CORE, LibraryClasses.common.DXE_DRIVER, LibraryClass= es.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryCla= sses.common.UEFI_APPLICATION] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf @@ -32,14 +32,8 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf =20 -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE - PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf -!endif - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRoute= rDxe.inf HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRou= terDxe.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf @@ -50,6 +44,9 @@ VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRunt= imeVariableReadLib.inf VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRu= ntimeVariableWriteLib.inf =20 +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVE= R, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATIO= N] + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf + [LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] !if $(TARGET) !=3D RELEASE DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf @@ -62,21 +59,15 @@ =20 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerform= anceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif !endif =20 +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER] + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf + [LibraryClasses.common.DXE_DRIVER] - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf TpmPlatformHierarchyLib|MinPlatformPkg/Tcg/Library/PeiDxeTpmPlatformHier= archyLib/PeiDxeTpmPlatformHierarchyLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -# PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf =20 [LibraryClasses.common.DXE_SMM_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableL= ib.inf MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.= inf ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmRepor= tStatusCodeLib.inf @@ -87,7 +78,6 @@ =20 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.= inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf !endif =20 SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCp= uPlatformHookLibNull.inf @@ -100,8 +90,6 @@ VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalM= mVariableWriteLib.inf =20 [LibraryClasses.common.SMM_CORE] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/Pi= SmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/Pi= SmmCoreSmmServicesTableLib.inf ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmRepor= tStatusCodeLib.inf @@ -109,31 +97,14 @@ =20 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerform= anceLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif !endif =20 [LibraryClasses.common.DXE_RUNTIME_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE - PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf =20 -[LibraryClasses.common.UEFI_DRIVER] - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf - [LibraryClasses.common.UEFI_APPLICATION] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - #PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf - -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE - PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.= inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf -!endif diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc b/Pla= tform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc index 1bf8338f95..8e91dba6ac 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc @@ -15,7 +15,12 @@ # PEI phase common # =20 -[LibraryClasses.common.SEC,LibraryClasses.common.PEI_CORE,LibraryClasses.c= ommon.PEIM] +[LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE] +!if $(TARGET) !=3D RELEASE + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf +!endif + +[LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses= .common.PEIM] S3BootScriptLib|MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptL= ibNull.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -25,39 +30,22 @@ LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf =20 - !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf !endif =20 TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf - VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf =20 [LibraryClasses.common.SEC] ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf -!if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf VariableReadLib|MinPlatformPkg/Library/BaseVariableReadLibNull/BaseVaria= bleReadLibNull.inf =20 -[LibraryClasses.common.PEI_CORE] +[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM] TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf -!if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -!endif - -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE - PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf -!endif =20 [LibraryClasses.common.PEIM] - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf =20 Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRoute= rPei.inf @@ -69,7 +57,4 @@ TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventLo= gRecordLib.inf TpmMeasurementLib|SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMeasure= mentLib.inf =20 -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE - PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf -!endif VariableReadLib|MinPlatformPkg/Library/PeiVariableReadLib/PeiVariableRea= dLib.inf --=20 2.36.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90915): https://edk2.groups.io/g/devel/message/90915 Mute This Topic: https://groups.io/mt/92075457/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-