From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.42561.1658246925203810991 for ; Tue, 19 Jul 2022 09:08:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=i2+dC0B8; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658246925; x=1689782925; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=7dJXGNEgOChvJTaqxdued4qP1fUGd2jcAaSuLY2iKFk=; b=i2+dC0B84lCcgWrz5iWVdBiWMNHIj9+GweSoX/YMsHWg305OLTQpnolG 8QCgB7bEGPgmgCycair+JgInOl+JODU2CkJRTaXu5At/3GCr8ErCE+0Sn U0qSesKT2LNAOtk561EtxiWmfF0JtlMbvZDCJzUqdPQpbH+W12XHeZBIO P+yXK/92xTEA2St7CX6GNbYe5S9CwqXJkZn1MAjaIquUnSYSCtHxMhxvc K8A46VY02P1y67FHjfJsmgH/hOwXjVgpeEZZ2ya+m81q+reb8TAXvMTug qr3Yqsla0LJX3MalRU3vKEetPMFuczQgW3oCB9c6qUGFvp2J+OZPBbOOU Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="266309250" X-IronPort-AV: E=Sophos;i="5.92,284,1650956400"; d="scan'208";a="266309250" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2022 09:08:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,284,1650956400"; d="scan'208";a="700508990" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga002.fm.intel.com with ESMTP; 19 Jul 2022 09:08:43 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 19 Jul 2022 09:08:41 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 19 Jul 2022 09:08:40 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28 via Frontend Transport; Tue, 19 Jul 2022 09:08:40 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.107) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 19 Jul 2022 09:08:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oexFtMm8pFvfLnc/08fpEjOzm2ud98lPiCmOA3TVAfMCRB4MB23IsoN7lZrkcO12v+xCqt7p4eQpUG1vNGvL2LQ5Uno3iGL+ng6kNt4Nqk6ffuM7N8gTuI6hgYdHSkc6ZskDNEpeAWkIic1m29WMUckMMw6sy5uk8GEVhi+9xwBo6av2UTfA9RATiQZe9EwZ/PiG5z2y6cSUWfTWQX4o23UKT0/VNK0v1ITqjeQ3HAhQKUMO8+R9MLxC1RreFORq3PgxDDJ3C7gk9AUZOdXQE/QMqvViizll4TlBtqToa9fTAglNmhBWzMGjcVijVegwlD7t9IjsDA5uG/Mm2cXTlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B/KM4Zqwzs69Ch5uuIVEsvFqKI3OmERamjSnroYyqO0=; b=CYSxNITgRRnuWFGgDoCKtLEvyo3WP0AauUjWiSN+uNhpwStQfVanwq2H44XhLI6vFmNR0LlJmtlEjU1mhcomZki7DaWPBqgeAFUziLY/StwyIrMWryOyKgVKLoQzMZLo7KV/FwLloy/KRaEQ9r1rrLO2XBOlM9vrDo62w6vsslRnfhD/V8ipDF4xs5h7nvrcvNtYvHYu5Pfu4E05Pb7ZiH6UaZI6ZkmA/cKR99qh+W2PenIYEAtAyH27zBHZR67lOkPc/uLALd08PQlQl87R0RLkf7G8AvDGMGhDP6JpAaWmPjVr6XoOiUjR1oOjKPnUP0iyDaVjWqJ63I5a7HwicA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by DM6PR11MB3244.namprd11.prod.outlook.com (2603:10b6:5:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21; Tue, 19 Jul 2022 16:08:35 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::a113:c892:d94:dd10]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::a113:c892:d94:dd10%8]) with mapi id 15.20.5438.024; Tue, 19 Jul 2022 16:08:35 +0000 From: "Chiu, Chasel" To: "Oram, Isaac W" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Gao, Liming" , "Dong, Eric" Subject: Re: [edk2-devel][edk2-platforms][PATCH V1 2/2] MinPlatformPkg/Build: Reduce duplication Thread-Topic: [edk2-devel][edk2-platforms][PATCH V1 2/2] MinPlatformPkg/Build: Reduce duplication Thread-Index: AQHYjAU/QGl3vDpaWEGu8mHFpj1R5q2F+ebw Date: Tue, 19 Jul 2022 16:08:34 +0000 Message-ID: References: <31499f57e5001e64fe2f54f9cae90bbc6aa4e984.1656539669.git.isaac.w.oram@intel.com> In-Reply-To: <31499f57e5001e64fe2f54f9cae90bbc6aa4e984.1656539669.git.isaac.w.oram@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0f629c2f-b4f4-42ac-0f06-08da69a0eee3 x-ms-traffictypediagnostic: DM6PR11MB3244:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: z2h/Vzz2jZXrpXILrHxwC7z6jAI88bSajTHY97vmseC9k1ppT0WtuZLktDe6QXvdTXRDe/cQ43lPXAGRUNtyvukqMfC6RF+izeCr6FbgypsZ3mnz/swAkxD6EQi+4l32VbpqVMcp22NTiTvlH/E/JnUj23p4paC3MBm868Xk2X1NLKhwa1KklFP7zZ4DpyxEoCP2CxHaL3JC2lYM5HSyHnTUATljCclZyBjx1LRNVfu0PlT159ruYlGjo77heX6C4G1bS5OHHLHMBkRBImHeCGuZgQqTqKSte56CStNPKUUqDrNXXOu09z4VRDIpTWuPLNpefgSXJKBzzyh3Qw0rp41TfgK9nly44SR1vryLMhh6lCnNNc8E3FBKJ5Ndr9nGFcGGeNf3soSDktkjKKSVmjkB8k8ZL0mDxkA0vjsSThhjxuhzz/8beqO9/79x1jv1i/hpEM7mPMRnKLP1VE5iobnntTUste+V10ydZiIt24fnOmXox88K9FxuElhF6+xvL+zB/pFI6LMOCwUP6DOXpjulkas10Oc/nwT1puoL3Lunbe6fHCa5/JLcXwRQJYKAHsQG1ewYY+cRc88TGTGt+T7K1cGnlBQTW9hwpGTJakFJOFWMuLDT0DU5jdeg7OFuKohwmW2Deac+NRpFU5qufXV1veNCvbZsdtRtTx7a6p6slKm8JeLZ2CeiKyFCRGweSA5QkFdldXBXDUZV7XHGstwlrIQ5+Jwl/Fj9mO6Mm25HpW4zPrv3QRUpiOu/H0eRdnE0S8tZR7TpbrKOlr3F8Cntbtt7jg8s9zOYRHVkyKa2B/GfWuK4q5PTgVDl0Kns x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(376002)(366004)(396003)(39860400002)(346002)(38100700002)(33656002)(8936002)(52536014)(76116006)(66946007)(64756008)(4326008)(66556008)(66446008)(8676002)(19627235002)(38070700005)(66476007)(53546011)(316002)(54906003)(7696005)(6506007)(82960400001)(110136005)(83380400001)(186003)(41300700001)(107886003)(9686003)(55016003)(2906002)(30864003)(26005)(122000001)(86362001)(5660300002)(478600001)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?D5p6KX/2FlwPOwodLmBl3QjRiSNG3mur+jeX/3pAekJOVonGBzvGG8V593X2?= =?us-ascii?Q?3xmbChseMBdSu3sT++1BC27JEOniPvO8lZwBTjM/X4mM8QyTMsucrxYOd3Ea?= =?us-ascii?Q?NTqT3tXRqChylUDWoBkRxvAttGHPSc/4nLRsFJuXycxc4LnCDxpS2Ohp4EDd?= =?us-ascii?Q?+gfBmlrSGaUdvSyAc45PJeb5syrLq8LJPMYzA4g2+hOrtQZjrXCgJLtuKEU2?= =?us-ascii?Q?fTV+V2q3Nswu7eN001iXcbrWBzRDmTiVyP+wRf5m5zJh1FQVo3QsQd5h/TKR?= =?us-ascii?Q?F/HRrKYND6znQIddqIOLxCfPMAj5C3svcXyCK0Pjd933zwPRSfa8DSk1FwQW?= =?us-ascii?Q?8Zq7kWLx4zvXxaP+x73qrbzssT6SOKHl9eyuxmDMcdDdxGGWjxJz2MYjnw83?= =?us-ascii?Q?nr+YXEaOJDOVz2JEVRxHdAkN5mdFwdT8rK4EoW2BmM6y9LoAiYc4zFgFeHDw?= =?us-ascii?Q?wWrV8/ZQJwShXYCB/PvxJMsipyqp0Qozzf6cSRbpa3JB+ZKDLiKP9L+qePlQ?= =?us-ascii?Q?50OK5bQK323wc3BiHu+srmw71VSfHzdGY8EsdRl+Uu42LBFBlrqAO38RiRGV?= =?us-ascii?Q?VxcagcvkO8qc58GmDvQXwJYWSG1qvL4PUoPrKjNVuKCIJFNq7OScIVrMg8+1?= =?us-ascii?Q?JVu7FHl33lORpEYFY9I0CsR3wXbJXpKs51xPZjBNPQ4CTYq0uXP+cdh6VUQn?= =?us-ascii?Q?Ufr5QojkCB91yRS185a8LQjpK+Psf4ytAZ1U00FUPVJnlvsg+SBL0iPEEgVX?= =?us-ascii?Q?9ip8jmioSal4Y8aV5P6PSF2ZIW66cK0m/8JtrYNgXtgdg+g+BPpHfOeIyTwZ?= =?us-ascii?Q?oAG6MwazaW8xiBnEhTnHcE841Lj8zDbOHiZPWgzOHXdYOSu/mJpQaQ6MVQGK?= =?us-ascii?Q?JhAQrERKTyrJpOJrg+IvNEoaBjM5AQ54Ys9Qj0J0vlDkpjCNGBuGzcQAaWyh?= =?us-ascii?Q?GWRMvQchxpFedIInpPFQXRls7d28+o5bsuEojcMNNVscR6/Gf5TNHt3XJy0y?= =?us-ascii?Q?ERw4iZPikFPaXBn0NOsRLGqXZMQErtQxWCDq2uUJ0zAlrFjK+mQJf/rTJvk0?= =?us-ascii?Q?FPJtcKSsPD2FgWCKRlAK76mGjjtK61KEUkn/2NVYym2HUHxZX1qhGWxAHxHh?= =?us-ascii?Q?jf5MkkpCbBFgfB3v/DpWvU0S3E9SpeJbTtZeS3eUnsWiIKzqt2mrbJx4cEFp?= =?us-ascii?Q?5IF7Tg/fJqHv7rwoZqGrvAHMK/y/2794eNrZuvrXAZeHQasjVl4q446T7hWz?= =?us-ascii?Q?sWTOm6HmGi4FTtXuMxYJAsXtoenlMf2y8g3s/GxpB2LXUR/JPFjguKjFDhKS?= =?us-ascii?Q?FyDFrCvEAjN0A1UiLL8hk7YHvLjcDD36fvLdDEScLnotpJ9HDD5UIOrqcLHG?= =?us-ascii?Q?zoByWQuWFNaqdhtHgGo4e7h9F5j5Zu5qKOA9yYSt6FbfFjXbXEOK3YWjvv+k?= =?us-ascii?Q?dDbgjTpQFZBo03czUoMmeByqRS94vEEzpjh61nWn/eiviR20hHr2JLBRshie?= =?us-ascii?Q?/TIprz+Tpqo/JDSUB3XaZi4iBJFf4CoqMiVj5pAWUw9W7aQV9EMAJ+R/y99c?= =?us-ascii?Q?QPmYXQV5KMXsXbQzPpGgl4OM++6qqp7sQijT9vAR?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f629c2f-b4f4-42ac-0f06-08da69a0eee3 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 16:08:34.9419 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: YxdovKWGBTEnIsEC6pPCcYdT3oJCG4tucmf7NVFHe5wnKm4FtH2Iu1lpdNUp0KUTiWtmfXONSJmFcQ7ic9JVKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3244 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Isaac, Please see my question below inline. Thanks, Chasel > -----Original Message----- > From: Oram, Isaac W > Sent: Wednesday, June 29, 2022 3:12 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Gao, Liming ; > Dong, Eric > Subject: [edk2-devel][edk2-platforms][PATCH V1 2/2] MinPlatformPkg/Build: > Reduce duplication >=20 > Removed needless duplication between sections. > Addes spaces after commas. > Remove commented out code. >=20 > 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(-) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc > b/Platform/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 > ,LibraryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,Libra > ryClasses.common.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVE > R,LibraryClasses.common.UEFI_APPLICATION] > +# > +# DXE phase common > +# > +[LibraryClasses.common.DXE_CORE, > LibraryClasses.common.DXE_SMM_DRIVER, > +LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_DRIVER, > +LibraryClasses.common.DXE_RUNTIME_DRIVER, > +LibraryClasses.common.UEFI_DRIVER, > +LibraryClasses.common.UEFI_APPLICATION] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf >=20 > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryA > llocationLib.inf > @@ -32,14 +32,8 @@ >=20 > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLi > b.inf > TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf >=20 > -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE > - > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceL > ib.inf > -!endif > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMe > asurementLib.inf > - > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > - >=20 > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRout > erDxe.inf >=20 > HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRout > erDxe.inf >=20 > Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/Dx= eT > cg2PhysicalPresenceLib.inf > @@ -50,6 +44,9 @@ >=20 > VariableReadLib|MinPlatformPkg/Library/DxeRuntimeVariableReadLib/DxeRunti > meVariableReadLib.inf >=20 > VariableWriteLib|MinPlatformPkg/Library/DxeRuntimeVariableWriteLib/DxeRun > timeVariableWriteLib.inf >=20 > +[LibraryClasses.common.DXE_DRIVER, > +LibraryClasses.common.DXE_RUNTIME_DRIVER, > +LibraryClasses.common.UEFI_DRIVER, > +LibraryClasses.common.UEFI_APPLICATION] > + > +PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance > Lib > +.inf > + Why we always include DxePerformanceLib without checking enabling /disablin= g PCD? I think platforms might want to exclude DxePerformanceLib in some types of = builds. (e.g., Debug build) > [LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE] !if > $(TARGET) !=3D RELEASE >=20 > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > @@ -62,21 +59,15 @@ >=20 > !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE >=20 > PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerf > ormanceLib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > -!endif > !endif >=20 > +[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_DRIVER] > + > +Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.i > +nf > + > [LibraryClasses.common.DXE_DRIVER] > - > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in > f >=20 > 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 >=20 > SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTable > Lib.inf >=20 > MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib > .inf >=20 > ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmR > eportStatusCodeLib.inf > @@ -87,7 +78,6 @@ >=20 > !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE >=20 > PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanc > eLib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > !endif >=20 >=20 > SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/S > mmCpuPlatformHookLibNull.inf > @@ -100,8 +90,6 @@ >=20 > VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMm > VariableWriteLib.inf >=20 > [LibraryClasses.common.SMM_CORE] > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf >=20 > MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib > /PiSmmCoreMemoryAllocationLib.inf >=20 > SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib > /PiSmmCoreSmmServicesTableLib.inf >=20 > ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmR > eportStatusCodeLib.inf > @@ -109,31 +97,14 @@ >=20 > !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE >=20 > PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePe > rformanceLib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > -!endif > !endif >=20 > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf >=20 > ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib > /RuntimeDxeReportStatusCodeLib.inf > -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE > - > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceL > ib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > -!endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf >=20 > VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi= bRu > ntimeDxe.inf >=20 > -[LibraryClasses.common.UEFI_DRIVER] > - > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in > f > - > [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/DxePerformanceL > ib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > -!endif > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc > b/Platform/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.i > +nf > +!endif > + > +[LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, > +LibraryClasses.common.PEIM] >=20 > S3BootScriptLib|MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLi= b > Null.inf > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > @@ -25,39 +30,22 @@ > LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf >=20 > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCp > uExceptionHandlerLib.inf >=20 > - > !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE >=20 > PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib > .inf > !endif Here we checking PCD for including PeiPerformanceLib.inf, should we apply t= he same check for DxePerformanceLib.inf? >=20 > TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > - > VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf >=20 > [LibraryClasses.common.SEC] >=20 > ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepo > rtStatusCodeLibNull.inf > - > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCp > uExceptionHandlerLib.inf > -!if $(TARGET) !=3D RELEASE > - > DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > -!endif > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf >=20 > VariableReadLib|MinPlatformPkg/Library/BaseVariableReadLibNull/BaseVariab= l > eReadLibNull.inf >=20 > -[LibraryClasses.common.PEI_CORE] > +[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM] > TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf > - > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCp > uExceptionHandlerLib.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/SecPeiCp > uExceptionHandlerLib.inf > - TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf > - > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf >=20 >=20 > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRout > erPei.inf > @@ -69,7 +57,4 @@ >=20 > TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventLo > gRecordLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/PeiTpmMeasurementLib/PeiTpmMea > surementLib.inf >=20 > -!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable =3D=3D TRUE > - > PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib > .inf > -!endif >=20 > VariableReadLib|MinPlatformPkg/Library/PeiVariableReadLib/PeiVariableRead= Li > b.inf > -- > 2.36.1.windows.1