From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=YK574ipK; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660171622; x=1691707622; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NDZthOYqaeAdX0PUxvAVoF5QxnHFhS94qOk7rZzn/Iw=; b=YK574ipK/pHdG1HfvxP0L4H6pOJgr+JHC1O45pqwL5zHCuLYUw+JCPkC mpRppiUXYSp4vR0S31mdNnlcTS42HP+3y5xZ4VBRRd371L+I2zuRNFmc0 3qJail0Ozbq7SB2k88HA/LLcSD7sub7FmIOfZlobx3lCQzSxvqI4/nS78 oUj0ygysgv35RtXi8A/BTQh02+TZGkgcKTRLlfNIppKetF6yhpotzKX5V Tc9YPIUtyNI8Il4Yhfz7x8//iXChtcpL09wfit72dWBoLO/qJ73hJZqHy HsxomASErg87FgPq8yrMZvSb2L6qJkMumeiCIFJaO51Ikpx3LI1G8I3mQ g==; 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" 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" 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: X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- .../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 => PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf (92%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (87%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.inf (92%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/PchSpi.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/RegsSpi.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.inf (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dec => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec} (94%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dsc => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc} (95%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.fdf => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf} (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.py => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py} (93%) rename Features/Intel/{PlatformPayloadPkg => 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 == 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 # # 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/Features/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 == TRUE - !include PlatformPayloadPkg/Include/PostMemory.fdf + !include PlatformPayloadFeaturePkg/Include/PostMemory.fdf !endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf b/Features/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 == TRUE - !include PlatformPayloadPkg/Include/PreMemory.fdf + !include PlatformPayloadFeaturePkg/Include/PreMemory.fdf !endif diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbInfo.c b/Features/Intel/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/Features/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/Intel/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 [LibraryClasses] FlashDeviceLib diff --git a/Features/Intel/PlatformPayloadPkg/Fvb/FvbSmmCommon.h b/Features/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/NvVariableInfoGuid.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableInfoGuid.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Guid/NvVariableInfoGuid.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableInfoGuid.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Guid/SpiFlashInfoGuid.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInfoGuid.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Guid/SpiFlashInfoGuid.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInfoGuid.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/Library/FlashDeviceLib.h b/Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDeviceLib.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Include/Library/FlashDeviceLib.h rename to Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDeviceLib.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/SpiFlashLib.h diff --git a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc b/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc similarity index 87% rename from Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc rename to Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc index bc776659b6..8056b06548 100644 --- a/Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc +++ b/Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc @@ -49,8 +49,8 @@ [LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER] !if $(SMM_VARIABLE) == TRUE - SpiFlashLib|PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf - FlashDeviceLib|PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf + SpiFlashLib|PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf + FlashDeviceLib|PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf !endif @@ -79,15 +79,15 @@ # SMM Variable Support # !if $(SMM_VARIABLE) == TRUE - PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf { + PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf } - PlatformPayloadPkg/Fvb/FvbSmm.inf { + PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf - NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf + NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf } 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 } MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf { PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.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/Features/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) == 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.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf diff --git a/Features/Intel/PlatformPayloadPkg/Include/PreMemory.fdf b/Features/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/FlashDeviceLib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf similarity index 90% rename from Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf index 7285a37944..bddce099b3 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf @@ -29,10 +29,9 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec [LibraryClasses] DebugLib BaseMemoryLib SpiFlashLib - diff --git a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf similarity index 92% rename from Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf index 05411b00d8..02c98d9c4d 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf @@ -27,7 +27,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec [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/PchSpi.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/RegsSpi.h diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiCommon.h b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiCommon.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiCommon.h rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiCommon.h diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.c rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.c diff --git a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf similarity index 90% rename from Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf rename to Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf index fae851c12f..f09714f3f2 100644 --- a/Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf +++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf @@ -30,7 +30,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - PlatformPayloadPkg/PlatformPayloadPkg.dec + PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec [LibraryClasses] BaseLib diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h diff --git a/Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf b/Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf rename to Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec similarity index 94% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec index 549f96d85f..78d36f12eb 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec @@ -10,7 +10,7 @@ [Defines] DEC_SPECIFICATION = 0x00010005 - PACKAGE_NAME = PlatformPayloadPkg + PACKAGE_NAME = PlatformPayloadFeaturePkg PACKAGE_GUID = 17F3ACAC-079D-4518-9EBF-E33289733E8C PACKAGE_VERSION = 0.1 diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc similarity index 95% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc index 702523a73f..32e33ac53e 100644 --- a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc +++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc @@ -15,7 +15,7 @@ # ################################################################################ [Defines] - PLATFORM_NAME = PlatformPayloadPkg + PLATFORM_NAME = PlatformPayloadFeaturePkg PLATFORM_GUID = D3C551BE-9BC6-48F5-AA8A-F49425C28CA9 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 @@ -23,7 +23,7 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) - FLASH_DEFINITION = $(PLATFORM_NAME)/PlatformPayloadPkg.fdf + FLASH_DEFINITION = $(PLATFORM_NAME)/PlatformPayloadFeaturePkg.fdf PCD_DYNAMIC_AS_DYNAMICEX = TRUE DXE_ARCH = X64 diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.fdf b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf similarity index 100% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.fdf rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf diff --git a/Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py similarity index 93% rename from Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py rename to Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.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 script UniversalPayloadBuild.py") - PlatformFvDscPath = os.path.normpath("PlatformPayloadPkg/PlatformPayloadPkg.dsc") + PlatformFvDscPath = os.path.normpath("PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc") BuildDir = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64")) PlatformFvReportPath = os.path.join(BuildDir, "PlatformPayloadReport.txt") UniversalUefiPld = os.path.join(BuildDir, 'UniversalPayload.elf') - PlatformFv = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadPkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PlatformPayload.Fv")) + PlatformFv = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PlatformPayload.Fv")) if "CLANG_BIN" in os.environ: LlvmObjcopyPath = os.path.join(os.environ["CLANG_BIN"], "llvm-objcopy") diff --git a/Features/Intel/PlatformPayloadPkg/Readme.md b/Features/Intel/PlatformPayloadFeaturePkg/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 modules would be located in edk2-platform repo. The generic UEFI payload could be built from EDK2 UefiPayloadPkg in ELF format following -universal payload specification. And a Platform Payload could be built from PlatformPayloadPkg +universal payload specification. And a Platform Payload could be built from 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=%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Features\Intel; edk2\edksetup.bat ** Build universal UEFI payload with platform Payload -python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg.py -t VS2019 - -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE -D SMM_VARIABLE=TRUE +python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPayloadFeaturePkg.py -t VS2019 -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE -D SMM_VARIABLE=TRUE or python edk2\UefiPayloadPkg\UniversalPayloadBuild.py -t VS2019 -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE -python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg.py -t VS2019 -D SMM_VARIABLE=TRUE -s +python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPayloadFeaturePkg.py -t VS2019 -D SMM_VARIABLE=TRUE -s If build success, the final UEFI payload is at Build\UefiPayloadPkgX64\UniversalPayload.elf. @@ -55,7 +54,7 @@ Several build macros are used as below for SMM variable feature modules. 2. Data Flows SMM variable: -The interface with bootloader are defined in PlatformPayloadPkg\Include\Guid +The interface with bootloader are defined in PlatformPayloadFeaturePkg\Include\Guid SpiFlashInfoGuid.h -- SPI related information for SPI flash operation. NvVariableInfoGuid.h -- Variable related information for SPI NV variables. -- 2.36.1.windows.1