From nobody Mon Feb 9 03:30:56 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+92323+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+92323+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1660171623; cv=none; d=zohomail.com; s=zohoarc; b=WR8kXTt9siMFdOaa0DfLnfqHT04AfRQPlDmqS51bURkmVKdeZ7t8sOI5IKFO9udYAMb38aEIk0ftgAHTxt/7fE8MTi1gCrQzO+UVY3iJKE21PtuOpCJdCduSqRcKloBQCvti7h4wjY3c+Ib/GuFx6l+rP2IXTZ93PRVTrLc9Ucg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660171623; 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=XzP7/kgDSGkHqAD6WEJ6wYrLlEqESzDu1ryZ+j8ATqs=; b=R+hX7biLLXtn4BnyDZzuuGkZqVL/LXxuj+pzHlZZEV6rKjK+wgY5jFSeDPKJw9S0lkIr7M9cWDShg7tIu1Vbo3yILotcKsu2nAqTc0tBwKo3CZtm+xa73h386ZOINEpyDnr3t9aGrz/4is38l0ZonVdXA1oQfCMMQmvXOWSOvP4= 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+92323+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 1660171623305102.18344425280031; Wed, 10 Aug 2022 15:47:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id omtDYY1788612x4uaNECcVYA; 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="291211816" X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="291211816" 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="694690097" 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:47:00 -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 2/3] PlatformPayloadPkg: Rename to match other feature conventions Date: Wed, 10 Aug 2022 15:46:48 -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: U0KUyEdsw63jGnoShRiwgd0Ex1787277AA= 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=JBblqFyQ8cHZt/jQclwxyjK5ZfVNhs/YY+aTwkE74Lw=; h=Cc:Date:From:Reply-To:Subject:To; b=waZJ7ab0PP9SJGex7qryRgddvacztCMi4FfCofFTg47GE63J83C6nulI6B+kAxSZqZ/ KRlUNTNQW9k47hO+B+zmrKFmcRRnlr/EnNDC6QdQV0OOQ8o4xD4d/s8YuuIfZ9egQOs/n M+pTLMR6Leux07AjJMaeefpQ97bJ8QxaOCo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660171624133100004 Content-Type: text/plain; charset="utf-8" Rename PlatformPayloadPkg to PlatformPayloadFeaturePkg. Rename Package DEC, DSC, FDF and py scripts to match. Search and replace PlatformPayloadPkg with PlatformPayloadFeaturePkg. 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/AdvancedFeatures.dsc | 2 +- .../Include/AdvancedFeaturesPcd.dsc | 2 +- .../AdvancedFeaturePkg/Include/PostMemory.fdf | 2 +- .../Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 2 +- .../Fvb/FvbInfo.c | 0 .../Fvb/FvbService.c | 0 .../Fvb/FvbService.h | 0 .../Fvb/FvbServiceSmm.c | 0 .../Fvb/FvbSmm.inf | 2 +- .../Fvb/FvbSmmCommon.h | 0 .../Include/Guid/NvVariableInfoGuid.h | 0 .../Include/Guid/SpiFlashInfoGuid.h | 0 .../Include/Library/FlashDeviceLib.h | 0 .../Include/Library/SpiFlashLib.h | 0 .../Include/PlatformPayloadFeature.dsc | 14 +++++++------- .../Include/PostMemory.fdf | 4 ++-- .../Include/PreMemory.fdf | 0 .../Library/FlashDeviceLib/FlashDeviceLib.c | 0 .../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +-- .../Library/PcdInitLib/PcdInitLib.c | 0 .../Library/PcdInitLib/PcdInitLib.inf | 3 +-- .../Library/SpiFlashLib/PchSpi.c | 0 .../Library/SpiFlashLib/RegsSpi.h | 0 .../Library/SpiFlashLib/SpiCommon.h | 0 .../Library/SpiFlashLib/SpiFlashLib.c | 0 .../Library/SpiFlashLib/SpiFlashLib.inf | 2 +- .../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0 .../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0 .../PchSmiDispatchSmm/PchSmiDispatchSmm.inf | 0 .../PlatformPayloadFeaturePkg.dec} | 2 +- .../PlatformPayloadFeaturePkg.dsc} | 4 ++-- .../PlatformPayloadFeaturePkg.fdf} | 0 .../PlatformPayloadFeaturePkg.py} | 4 ++-- .../Readme.md | 9 ++++----- 34 files changed, 26 insertions(+), 29 deletions(-) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbInfo.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbService.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbService.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbServiceSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbSmm.inf (92%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Fvb/FvbSmmCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/Guid/NvVariableInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/Guid/SpiFlashInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/Library/FlashDeviceLib.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/Library/SpiFlashLib.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/PlatformPayloadFeature.dsc (87%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/PostMemory.fdf (77%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Include/PreMemory.fdf (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/FlashDeviceLib/FlashDeviceLib.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/FlashDeviceLib/FlashDeviceLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/PcdInitLib/PcdInitLib.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/PcdInitLib/PcdInitLib.inf (92%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/SpiFlashLib/PchSpi.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/SpiFlashLib/RegsSpi.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/SpiFlashLib/SpiCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/SpiFlashLib/SpiFlashLib.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Library/SpiFlashLib/SpiFlashLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= PchSmiDispatchSmm/PchSmiDispatchSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= PchSmiDispatchSmm/PchSmiDispatchSmm.h (100%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= PchSmiDispatchSmm/PchSmiDispatchSmm.inf (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dec =3D> Plat= formPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec} (94%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dsc =3D> Plat= formPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc} (95%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.fdf =3D> Plat= formPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf} (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.py =3D> Platf= ormPayloadFeaturePkg/PlatformPayloadFeaturePkg.py} (93%) rename Features/Intel/{PlatformPayloadPkg =3D> PlatformPayloadFeaturePkg}/= Readme.md (86%) diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc= b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 2a93ca1ec7..6a80546592 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -80,5 +80,5 @@ # Individual features # !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable =3D= =3D TRUE - !include PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc + !include PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc !endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.= dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc index 4e0054c226..08f258a48c 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc @@ -56,7 +56,7 @@ # # Individual features # - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec =20 # # The section below sets all PCDs to FALSE in this DSC file so the feature= is not enabled by default. diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf b/Fea= tures/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf index a0975d4d43..66032ba117 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf @@ -81,5 +81,5 @@ # Individual features # !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable =3D= =3D TRUE - !include PlatformPayloadPkg/Include/PostMemory.fdf + !include PlatformPayloadFeaturePkg/Include/PostMemory.fdf !endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf b/Feat= ures/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf index b2b821c9c4..9cd6de833b 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf @@ -81,5 +81,5 @@ # Individual features # !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable =3D= =3D TRUE - !include PlatformPayloadPkg/Include/PreMemory.fdf + !include PlatformPayloadFeaturePkg/Include/PreMemory.fdf !endif diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbInfo.c b/Features/Int= el/PlatformPayloadFeaturePkg/Fvb/FvbInfo.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbInfo.c rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbInfo.c diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbService.c b/Features/= Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbService.c rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.c diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbService.h b/Features/= Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbService.h rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.h diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbServiceSmm.c b/Featur= es/Intel/PlatformPayloadFeaturePkg/Fvb/FvbServiceSmm.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbServiceSmm.c rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbServiceSmm.c diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbSmm.inf b/Features/In= tel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf similarity index 92% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbSmm.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf index a56654ba09..f973465cba 100644 --- a/Features/Intel/PlatformPayloadPkg/Fvb/FvbSmm.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf @@ -28,7 +28,7 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec UefiCpuPkg/UefiCpuPkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec =20 [LibraryClasses] FlashDeviceLib diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbSmmCommon.h b/Feature= s/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmmCommon.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Fvb/FvbSmmCommon.h rename to Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmmCommon.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Guid/NvVariableInfoG= uid.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableInf= oGuid.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Guid/NvVariableInfoGu= id.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableI= nfoGuid.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Guid/SpiFlashInfoGui= d.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInfoGui= d.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Guid/SpiFlashInfoGuid= .h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInf= oGuid.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Library/FlashDeviceL= ib.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDevice= Lib.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Library/FlashDeviceLi= b.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDev= iceLib.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Library/SpiFlashLib.= h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Library/SpiFlashLib.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Library/SpiFlashLib.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Library/SpiFlash= Lib.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeatu= re.dsc b/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFe= ature.dsc similarity index 87% rename from Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeatur= e.dsc rename to Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadF= eature.dsc index bc776659b6..8056b06548 100644 --- a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc +++ b/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeatu= re.dsc @@ -49,8 +49,8 @@ =20 [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 + SpiFlashLib|PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.= inf + FlashDeviceLib|PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashD= eviceLib.inf DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf !endif =20 @@ -79,15 +79,15 @@ # SMM Variable Support # !if $(SMM_VARIABLE) =3D=3D TRUE - PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf { + PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf } =20 - PlatformPayloadPkg/Fvb/FvbSmm.inf { + PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf - NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf + NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf } =20 MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf { @@ -97,13 +97,13 @@ NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf - NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf + NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf } =20 MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf= { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHoo= kLib.inf - NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf + NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf } MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf { diff --git a/Features/Intel/PlatformPayloadPkg/Include/PostMemory.fdf b/Fea= tures/Intel/PlatformPayloadFeaturePkg/Include/PostMemory.fdf similarity index 77% rename from Features/Intel/PlatformPayloadPkg/Include/PostMemory.fdf rename to Features/Intel/PlatformPayloadFeaturePkg/Include/PostMemory.fdf index 54800b972c..33a0a4c6b2 100644 --- a/Features/Intel/PlatformPayloadPkg/Include/PostMemory.fdf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Include/PostMemory.fdf @@ -11,8 +11,8 @@ # SMM Support # !if $(SMM_VARIABLE) =3D=3D TRUE - INF PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf - INF PlatformPayloadPkg/Fvb/FvbSmm.inf + INF PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf + INF PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.i= nf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf diff --git a/Features/Intel/PlatformPayloadPkg/Include/PreMemory.fdf b/Feat= ures/Intel/PlatformPayloadFeaturePkg/Include/PreMemory.fdf similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/PreMemory.fdf rename to Features/Intel/PlatformPayloadFeaturePkg/Include/PreMemory.fdf diff --git a/Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/Flash= DeviceLib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceL= ib/FlashDeviceLib.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashD= eviceLib.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/F= lashDeviceLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/Flash= DeviceLib.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDevic= eLib/FlashDeviceLib.inf similarity index 90% rename from Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashD= eviceLib.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/F= lashDeviceLib.inf index 7285a37944..bddce099b3 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceL= ib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/Flash= DeviceLib.inf @@ -29,10 +29,9 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec =20 [LibraryClasses] DebugLib BaseMemoryLib SpiFlashLib - diff --git a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLi= b.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLi= b.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib= .c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdIn= itLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLi= b.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInit= Lib.inf similarity index 92% rename from Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib= .inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdIn= itLib.inf index 05411b00d8..02c98d9c4d 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLi= b.inf @@ -27,7 +27,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec =20 [LibraryClasses] BaseLib @@ -47,4 +47,3 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase - diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/PchSpi.c= b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/PchSpi.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/PchSpi.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/PchS= pi.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/RegsSpi.= h b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/RegsSpi.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/RegsSpi.h rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/Regs= Spi.h diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiCommo= n.h b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiCommo= n.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiCommon= .h rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiC= ommon.h diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlash= Lib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFla= shLib.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashL= ib.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiF= lashLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlash= Lib.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiF= lashLib.inf similarity index 90% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashL= ib.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiF= lashLib.inf index fae851c12f..f09714f3f2 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlash= Lib.inf @@ -30,7 +30,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDisp= atchSmm.c b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchS= miDispatchSmm.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispa= tchSmm.c rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmi= DispatchSmm.c diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDisp= atchSmm.h b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchS= miDispatchSmm.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispa= tchSmm.h rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmi= DispatchSmm.h diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDisp= atchSmm.inf b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/Pc= hSmiDispatchSmm.inf similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispa= tchSmm.inf rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmi= DispatchSmm.inf diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec b/Fea= tures/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec similarity index 94% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePk= g.dec index 549f96d85f..78d36f12eb 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec @@ -10,7 +10,7 @@ =20 [Defines] DEC_SPECIFICATION =3D 0x00010005 - PACKAGE_NAME =3D PlatformPayloadPkg + PACKAGE_NAME =3D PlatformPayloadFeaturePkg PACKAGE_GUID =3D 17F3ACAC-079D-4518-9EBF-E33289733E8C PACKAGE_VERSION =3D 0.1 =20 diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc b/Fea= tures/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc similarity index 95% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePk= g.dsc index 702523a73f..32e33ac53e 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc @@ -15,7 +15,7 @@ # ##########################################################################= ###### [Defines] - PLATFORM_NAME =3D PlatformPayloadPkg + PLATFORM_NAME =3D PlatformPayloadFeaturePkg PLATFORM_GUID =3D D3C551BE-9BC6-48F5-AA8A-F49425C2= 8CA9 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 @@ -23,7 +23,7 @@ BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER =3D DEFAULT OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) - FLASH_DEFINITION =3D $(PLATFORM_NAME)/PlatformPayload= Pkg.fdf + FLASH_DEFINITION =3D $(PLATFORM_NAME)/PlatformPayload= FeaturePkg.fdf PCD_DYNAMIC_AS_DYNAMICEX =3D TRUE DXE_ARCH =3D X64 =20 diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.fdf b/Fea= tures/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.fdf rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePk= g.fdf diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py b/Feat= ures/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py similarity index 93% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePk= g.py index 1e3e1cce21..2fbb821563 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py @@ -45,11 +45,11 @@ def BuildUniversalPayload(Args, MacroList): if not os.path.exists (Edk2PayloadBuildScript): raise Exception("Could not find universal UEFI payload build scrip= t UniversalPayloadBuild.py") =20 - PlatformFvDscPath =3D os.path.normpath("PlatformPayloadPkg/Platfo= rmPayloadPkg.dsc") + PlatformFvDscPath =3D os.path.normpath("PlatformPayloadFeaturePkg= /PlatformPayloadFeaturePkg.dsc") BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/UefiPayloadPkgX64")) PlatformFvReportPath =3D os.path.join(BuildDir, "PlatformPayloadRepo= rt.txt") UniversalUefiPld =3D os.path.join(BuildDir, 'UniversalPayload.el= f') - PlatformFv =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/PlatformPayloadPkg"), f"{BuildTarget}_{ToolChain}", os.p= ath.normpath("FV/PlatformPayload.Fv")) + PlatformFv =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}= ", os.path.normpath("FV/PlatformPayload.Fv")) =20 if "CLANG_BIN" in os.environ: LlvmObjcopyPath =3D os.path.join(os.environ["CLANG_BIN"], "llvm-ob= jcopy") diff --git a/Features/Intel/PlatformPayloadPkg/Readme.md b/Features/Intel/P= latformPayloadFeaturePkg/Readme.md similarity index 86% rename from Features/Intel/PlatformPayloadPkg/Readme.md rename to Features/Intel/PlatformPayloadFeaturePkg/Readme.md index 938b557f30..1067196388 100644 --- a/Features/Intel/PlatformPayloadPkg/Readme.md +++ b/Features/Intel/PlatformPayloadFeaturePkg/Readme.md @@ -15,7 +15,7 @@ or bootloader dependency (only for coreboot). These modul= es would be located in edk2-platform repo. =20 The generic UEFI payload could be built from EDK2 UefiPayloadPkg in ELF fo= rmat following -universal payload specification. And a Platform Payload could be built fro= m PlatformPayloadPkg +universal payload specification. And a Platform Payload could be built fro= m PlatformPayloadFeaturePkg to provide Intel platform specific features (e.g. SPI module, PCH SMM) in = FV/FD format. This platform payload could be inserted into universal UEFI payload as an = ELF section to generate a full-feature payload. @@ -32,11 +32,10 @@ set PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\edk2-p= latforms\Features\Intel; edk2\edksetup.bat =20 ** Build universal UEFI payload with platform Payload -python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg= .py -t VS2019 - -D SMM_SUPPORT=3DTRUE -DVARIABLE_SUPPORT=3DNONE -D SMM_VARIABLE=3DTRUE +python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPay= loadFeaturePkg.py -t VS2019 -D SMM_SUPPORT=3DTRUE -DVARIABLE_SUPPORT=3DNONE= -D SMM_VARIABLE=3DTRUE or python edk2\UefiPayloadPkg\UniversalPayloadBuild.py -t VS2019 -D SMM_SUPPO= RT=3DTRUE -DVARIABLE_SUPPORT=3DNONE -python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg= .py -t VS2019 -D SMM_VARIABLE=3DTRUE -s +python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPay= loadFeaturePkg.py -t VS2019 -D SMM_VARIABLE=3DTRUE -s =20 If build success, the final UEFI payload is at Build\UefiPayloadPkgX64\U= niversalPayload.elf. =20 @@ -55,7 +54,7 @@ Several build macros are used as below for SMM variable f= eature modules. =20 2. Data Flows SMM variable: -The interface with bootloader are defined in PlatformPayloadPkg\Include\Gu= id +The interface with bootloader are defined in PlatformPayloadFeaturePkg\Inc= lude\Guid SpiFlashInfoGuid.h -- SPI related information for SPI flash operation. NvVariableInfoGuid.h -- Variable related information for SPI NV variables. =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 (#92323): https://edk2.groups.io/g/devel/message/92323 Mute This Topic: https://groups.io/mt/92947541/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-