3 files changed, 2 insertions, 10 deletions
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index a9ee051263..91e94e263d 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -158,9 +158,9 @@ PcdPeimInit (
   ASSERT_EFI_ERROR (Status);
 
   //
-  // Only install PcdInfo PPI when the feature is enabled and PCD info content is present. 
+  // Only install PcdInfo PPI when PCD info content is present. 
   //
-  if (FeaturePcdGet (PcdPcdInfoGeneration) && (DataBase->PcdNameTableOffset != 0)) {
+  if (DataBase->PcdNameTableOffset != 0) {
     //
     // Install GET_PCD_INFO_PPI and EFI_GET_PCD_INFO_PPI.
     //
@@ -232,9 +232,6 @@ PeiGetPcdInfoGetSku (
   VOID
   )
 {
-  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {
-    return EFI_UNSUPPORTED;
-  }
   return GetPcdDatabase()->SystemSkuId;
 }
 
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index fabe63c4f4..357f047ff0 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -343,7 +343,6 @@
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable ## SOMETIMES_CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration
 
 [Depex]
   TRUE
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 04ae874a21..e42d045d27 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -247,10 +247,6 @@ PeiGetPcdInfo (
   UINTN                 PeiNexTokenNumber;
   UINT32                LocalTokenNumber;
 
-  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {
-    return EFI_UNSUPPORTED;
-  }
-
   ASSERT (PcdInfo != NULL);
 
   PeiPcdDb          = GetPcdDatabase ();