diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2025-04-21 18:40:32 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-04-22 14:43:52 +0000 |
| commit | be4ae9a97db964a103eee3f7369b10c69daf7f04 (patch) | |
| tree | b822c3ead9682f0d673e27d63050992a42d0688b | |
| parent | 3c79bd38e0d034170a4c7d6c6f01c48c704fdfe4 (diff) | |
| download | edk2-be4ae9a97db964a103eee3f7369b10c69daf7f04.zip edk2-be4ae9a97db964a103eee3f7369b10c69daf7f04.tar.gz edk2-be4ae9a97db964a103eee3f7369b10c69daf7f04.tar.bz2 | |
MdePkg/Include/Ppi: Add back gEdkiiPeiMpServices2PpiGuid
Commit aef50446ced0662c8dfd968ab0ea05cc88b989ae
removed gEdkiiPeiMpServices2PpiGuid from UefiCpuPkg.dec
which causes build breaks if an INF [Ppis] section
lists gEdkiiPeiMpServices2PpiGuid. There is no method
for a DEC file for conditionally declare a PPI.
In order to support the migration from use of
gEdkiiPeiMpServices2PpiGuid to the preferred use of the
gPeiMpServices2Ppi, update MpServices2.h in MdePkg
to define EDKII_PEI_MP_SERVICES2_PPI_GUID and
EDKII_PEI_MP_SERVICES2_PPI.
All references to the EDK II PEI MP Services 2 PPI can be
removed after all downstream consumers have had a chance
to perform the migration.
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
| -rw-r--r-- | MdePkg/Include/Ppi/MpServices2.h | 12 | ||||
| -rw-r--r-- | MdePkg/MdePkg.ci.yaml | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/MdePkg/Include/Ppi/MpServices2.h b/MdePkg/Include/Ppi/MpServices2.h index 082d02f..b1e9c60 100644 --- a/MdePkg/Include/Ppi/MpServices2.h +++ b/MdePkg/Include/Ppi/MpServices2.h @@ -280,15 +280,13 @@ struct _EFI_PEI_MP_SERVICES2_PPI { extern EFI_GUID gEfiPeiMpServices2PpiGuid;
-// For backwards compatability. To be removed.
-#ifdef ENABLE_DEPRECATED_EDKII_MP_SERVICES2
-
+//
+// The EDK II PEI MP Services 2 PPI has been replaced by the PEI MP Services 2
+// PPI in the MdePkg. The following definitions are only present for backwards
+// compatibility and will be removed in the future.
+//
#define EDKII_PEI_MP_SERVICES2_PPI_GUID EFI_PEI_MP_SERVICES2_PPI_GUID
typedef EFI_PEI_MP_SERVICES2_PPI EDKII_PEI_MP_SERVICES2_PPI;
-#define gEdkiiPeiMpServices2PpiGuid gEfiPeiMpServices2PpiGuid
-
-#endif
-
#endif
diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml index cebccba..0fd3916 100644 --- a/MdePkg/MdePkg.ci.yaml +++ b/MdePkg/MdePkg.ci.yaml @@ -165,6 +165,7 @@ "gEfiPeiMmAccessPpiGuid=gPeiSmmAccessPpiGuid",
"gPeiSmmControlPpiGuid=gEfiPeiMmControlPpiGuid",
"gEfiPeiMmCommunicationPpiGuid=gEfiPeiSmmCommunicationPpiGuid",
+ "gEdkiiPeiMpServices2PpiGuid=gEfiPeiMpServices2PpiGuid",
]
},
|