From nobody Sun Feb 8 18:43:47 2026 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+92322+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+92322+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660171624; cv=none; d=zohomail.com; s=zohoarc; b=ec6Cq8DcE4hz9l7ie/PMTSdMBb781lLDxvKVianSgd1A7VKqimSYf9a/K9A3e7q+OuIce0NW1R79G1jW2GPW7aa+55QIhAoSbfHmm3XoSIXKsQ6bEqPHH5l71fUERr8JwdO/kUTCb2lFs3LNXNw1fh/Bz0iI9Xm7DJeRijDaqSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660171624; 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=o1YEzI67UQ8cr7ZPEjDqswuAJNLe/tzzEfXmoTF3lpE=; b=YFkrUGfj33Dfve3+S+R1773/ryjRLUCxdT2Ej+3XoBtFohg1Zv4l2N5WZDGT7/AwpMGw5p3kMUipiBvKI7vh7zYw50pmuXY/GbkICcJjGpD5d/9MfiAWTILHubSGGvhVAHb7EdBFeyQTr2b8TuCx+667iFUxNR3nJQC2GndaniQ= 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+92322+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 1660171624243992.5805336701009; Wed, 10 Aug 2022 15:47:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id dpdUYY1788612xJ7lx023R76; Wed, 10 Aug 2022 15:47:03 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.104.1660171621665418620 for ; Wed, 10 Aug 2022 15:47:02 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10435"; a="291211813" X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="291211813" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 15:47:00 -0700 X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="694690093" X-Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 15:46:59 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Nate DeSimone , Liming Gao , Ray Ni , Guo Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 1/3] PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue Date: Wed, 10 Aug 2022 15:46:47 -0700 Message-Id: <2c8041f852ea4462daabe8bb323f201caa9b501f.1660171324.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: VsOVPUVHmt4rJEVHqNW9KSXIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660171623; bh=ApxSx2M7FGSlbm0hZBh7D6PNEQHfLvav/dNT1CBAHMM=; h=Cc:Date:From:Reply-To:Subject:To; b=MdWocDxoUXFIyXHp0z3Xcra2477y725jotFRgUyV1ZCZ9/71zSZLl7kPJ45l8+R3ZvA CIdjEHl5cmLmy5MqFiDyTbxXyqR5FZXH+Jwbrn5nDpVJ3yvFoTzi0ur3RhUTLxqIABf3z tb4yFg9h6voUrgfV8ajv3JzijJCOpZKjesU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660171626050100011 Content-Type: text/plain; charset="utf-8" Feature packages should build with -a IA32 -a X64. The commonly board selected libraries were moved to the PlatformPayloadPkg build so as not to conflict with other advanced features. Cc: Sai Chaganty Cc: Nate DeSimone Cc: Liming Gao Cc: Ray Ni Cc: Guo Dong Signed-off-by: Isaac Oram Reviewed-by: Guo Dong Reviewed-by: Sai Chaganty --- .../Include/PlatformPayloadFeature.dsc | 42 +++++++++---------- .../PlatformPayloadPkg/PlatformPayloadPkg.dsc | 26 +++++++++++- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeatu= re.dsc b/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.d= sc index 3003c563c9..bc776659b6 100644 --- a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc +++ b/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc @@ -19,7 +19,9 @@ !error "DXE_ARCH must be specified to build this feature!" !endif =20 - DEFINE SMM_VARIABLE =3D TRUE + !ifndef SMM_VARIABLE + DEFINE SMM_VARIABLE =3D TRUE + !endif =20 =20 ##########################################################################= ###### @@ -28,7 +30,7 @@ # ##########################################################################= ###### =20 -[PcdsPatchableInModule.X64] +[PcdsPatchableInModule] !if $(SMM_VARIABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 @@ -45,24 +47,11 @@ # ##########################################################################= ###### =20 -[LibraryClasses] - !if $(SMM_VARIABLE) =3D=3D TRUE - PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf - PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf - # (Optional for variable modules debug output - PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib= .inf - DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.= inf - !endif - [LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.DXE_RUNTIME_DR= IVER] !if $(SMM_VARIABLE) =3D=3D TRUE SpiFlashLib|PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf FlashDeviceLib|PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLi= b.inf DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf - HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf - TimerLib|UefiCpuPkg/Library/CpuTimerLib/BaseCpuTimerLib.inf !endif =20 ##########################################################################= ###### @@ -90,13 +79,20 @@ # SMM Variable Support # !if $(SMM_VARIABLE) =3D=3D TRUE - PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf - PlatformPayloadPkg/Fvb/FvbSmm.inf { - - NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf - } + PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf { + + PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf + } + + PlatformPayloadPkg/Fvb/FvbSmm.inf { + + PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf + NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf + } + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { + PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf @@ -106,7 +102,11 @@ =20 MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf= { + PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf } - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf { + + PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf + } !endif diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc b/Fea= tures/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc index adf028c511..702523a73f 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc +++ b/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc @@ -27,6 +27,10 @@ PCD_DYNAMIC_AS_DYNAMICEX =3D TRUE DXE_ARCH =3D X64 =20 + !ifndef SMM_VARIABLE + DEFINE SMM_VARIABLE =3D TRUE + !endif + [Packages] MinPlatformPkg/MinPlatformPkg.dec =20 @@ -55,7 +59,7 @@ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable = |FALSE gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable = |FALSE =20 -[PcdsPatchableInModule.X64] +[PcdsPatchableInModule] gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F !if $(SOURCE_DEBUG_ENABLE) @@ -90,6 +94,26 @@ !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc =20 +# +# For standalone platform payload package build there are specific library= requirements +# + +[LibraryClasses] + !if $(SMM_VARIABLE) =3D=3D TRUE + PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf + PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf + # (Optional for variable modules debug output + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.= inf + !endif + +[LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.DXE_RUNTIME_DR= IVER] + !if $(SMM_VARIABLE) =3D=3D TRUE + HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf + TimerLib|UefiCpuPkg/Library/CpuTimerLib/BaseCpuTimerLib.inf + !endif + # # This package always builds the feature. # --=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 (#92322): https://edk2.groups.io/g/devel/message/92322 Mute This Topic: https://groups.io/mt/92947540/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-