Use single one PcdFrameworkCompatibilitySupport PCD to support framework HII and FvHob.

Remove patchable type Flash related PCD.
Simplify single one PcdPeiFullPcdDatabaseEnable to produce full or minimal Pei PCD services.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7678 6f19259b-4bc3-4df7-8a09-765794883524

11 files changed, 22 insertions, 109 deletions

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 7cb2b8d..cf1f8d5 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -638,7 +638,7 @@ PeiFvFindNextVolume (
   //

   // Handle Framework FvHob and Install FvInfo Ppi for it.

   //

-  if (FeaturePcdGet (PcdFrameworkFvHobCompatibilitySupport)) {

+  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {

     //

     // Loop to search the wanted FirmwareVolume which supports FFS

     //

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index d9c5351..0adb778 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -94,5 +94,5 @@
 

 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport	   ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	         ## CONSUMES

   
\ No newline at end of file
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6ab79ae..ca3b572 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -220,28 +220,12 @@
 [PcdsFeatureFlag.common]

   ## Indicate whether platform can support update capsule across a system reset

   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d

-  

-  ## This feature flag can be used to enable or disable the Pcd PEIM database 

-  #  traverse capability. Disable it can reduce the size of final image generated.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010020

-  

-  ## This feature flag can be used to enable or disable the Pcd DXE database 

-  #  traverse capability. Disable it can reduce the size of final image generated.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010021

-  

-  ## This feature flag can be used to enable or disable the SET capability of PCD service PEIM.

-  #  If a platform does not do PCD SET operation in PEI phase. This flag can be set to DISABLE to save size.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE|BOOLEAN|0x00010030

-  

-  ## This feature flag can be used to enable or disable the GET size capability of PCD service PEIM.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE|BOOLEAN|0x00010031

-  

-  ## This feature flag can be used to enable or disable the Callback On SET capability of PCD service PEIM. 

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE|BOOLEAN|0x00010032

-  

-  ## This feature flag can be used to enable or disable the PCD service PEIM to handle DynamicEX PCD. 

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE|BOOLEAN|0x00010033

  

+  ## This feature flag can be used to enable or disable all PCD PEIM services.

+  #  If TRUE, all PCD PEIM services will be provided.

+  ## If FALSE, the minimal PCD PEIM services (only GetService) will be provided.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable|TRUE|BOOLEAN|0x00010020

+

   ## If TRUE, then the Device Path To Text Protocol should be produced by the platform.

   #  It can be disabled to save size.

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE|BOOLEAN|0x00010037

@@ -294,11 +278,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver|FALSE|BOOLEAN|0x00010200

 

   ## If TRUE, Setup Browser supports GUID opcodes generated from Framework HII VFR file by VFR compiler. 

-  #  This is used to provide backward compatibility support to Framework HII module built togehter EdkCompatbilityPkg.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport|TRUE|BOOLEAN|0x00012008

-  

-  ## If TRUE, the PeiCore will handle the framework FvHob and install FvInfo PPI for it.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport|FALSE|BOOLEAN|0x00012009

+  #  If TRUE, the PeiCore will handle the framework FvHob and install FvInfo PPI for it.

+  ## This is used to provide backward compatibility support to Framework HII and Framework FvHob.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE|BOOLEAN|0x00012009

   

   ##

   #  If TRUE, HelloWorld Application will print the verbose information.

@@ -413,22 +395,13 @@
 [PcdsDynamic.common]

   ## Base address of the NV variable range in flash device 

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

-  

-  ## Size of the NV variable range.  

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002

 

   ## Base address of the FTW spare block range in flash device.

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013

 

-  ## Size of the FTW spare block range.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014

-

   ## Base address of the FTW working block range in flash device.

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010

 

-  ## Size of the FTW working block range.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011

-

   ## Default timeout value for displaying progressing bar in before boot OS.

   #  This value can be changed in BDS.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001

@@ -462,24 +435,6 @@
   ## Maximun number of performance log entries during PEI phase.

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|40|UINT8|0x0001002f

 

-  ## Base address of the NV variable range in flash device 

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

-  

-  ## Size of the NV variable range.  

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002

-

-  ## Base address of the FTW spare block range in flash device.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013

-

-  ## Size of the FTW spare block range.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014

-

-  ## Base address of the FTW working block range in flash device.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010

-

-  ## Size of the FTW working block range.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011

-

   ## Default timeout value for displaying progressing bar in before boot OS.

   #  This value can be changed in BDS.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 3a20e03..1a7acdf 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -151,12 +151,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE

   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 0c44a64..db9594a 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -948,10 +948,6 @@ DxePcdGetNextToken (
   BOOLEAN             PeiExMapTableEmpty;

   BOOLEAN             DxeExMapTableEmpty;

 

-  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {

-    return EFI_UNSUPPORTED;

-  }

-

   Status = EFI_NOT_FOUND;

   PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;

   DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;

@@ -1065,14 +1061,11 @@ GetDistinctTokenSpace (
 /**

   Get next token space in PCD database according to given token space guid.

   

-  This routine is enable only when feature flag PCD PcdDxePcdDatabaseTraverseEnabled 

-  is TRUE.

-  

   @param Guid            Given token space guid. If NULL, then Guid will be set to 

                          the first PCD token space in PCD database, If not NULL, then

                          Guid will be set to next PCD token space.

 

-  @retval EFI_UNSUPPORTED If feature flag PCD PcdDxePcdDatabaseTraverseEnabled is FALSE.

+  @retval EFI_UNSUPPORTED 

   @retval EFI_NOT_FOUND   If PCD database has no token space table or can not find given

                           token space in PCD database.

   @retval EFI_SUCCESS     Success to get next token space guid.

@@ -1094,10 +1087,6 @@ DxePcdGetNextTokenSpace (
   BOOLEAN             PeiExMapTableEmpty;

   BOOLEAN             DxeExMapTableEmpty;

 

-  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {

-    return EFI_UNSUPPORTED;

-  }

-

   ASSERT (Guid != NULL);

   

   PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 345e9f6..93758ff 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -57,9 +57,6 @@
 [Protocols]

   gPcdProtocolGuid                              ## PRODUCES

 

-[FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled

-

 [FixedPcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 41b3426..ecbdc94 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -260,15 +260,6 @@ PeiPcdGetSize (
   UINTN               Size;

   UINTN               MaxSize;

 

-  //

-  // If DebugAssertEnabled is TRUE, we still need to provide the GET size

-  // function as GetWorker and SetWoker need this function to do ASSERT.

-  //

-  if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&

-      (!DebugAssertEnabled ())) {

-    return 0;

-  }

-

   PeiPcdDb = GetPcdDatabase ();

   //

   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.

@@ -458,10 +449,6 @@ PeiPcdGetSizeEx (
   IN UINTN                        ExTokenNumber

   )

 {

-  if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) ||  !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {

-    return 0;

-  }

-

   return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));

 }

 

@@ -831,7 +818,7 @@ PeiRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction

   )

 {

-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {

+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

 

@@ -862,7 +849,7 @@ PcdUnRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction

   )

 {

-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {

+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

 

@@ -906,7 +893,7 @@ PeiPcdGetNextToken (
   BOOLEAN             Found;

   BOOLEAN             PeiExMapTableEmpty;

 

-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {

+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

 

@@ -1023,7 +1010,7 @@ PeiPcdGetNextTokenSpace (
   BOOLEAN             Found;

   BOOLEAN             PeiExMapTableEmpty;

 

-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {

+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index c00cbbe..91c3812 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -55,15 +55,11 @@
   gPcdPpiGuid                                   ## PRODUCES

 

 [FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable

 

 [FixedPcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiPcdDatabaseCallbackOnSetEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 10cc228..5bc1dc8 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -360,7 +360,7 @@ SetWorker (
   VOID                *InternalData;

   UINTN               MaxSize;

 

-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {

+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

   

@@ -514,7 +514,7 @@ ExSetWorker (
 {

   UINTN                     TokenNumber;

 

-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {

+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {

     return EFI_UNSUPPORTED;

   }

 

@@ -542,12 +542,7 @@ ExGetWorker (
   IN UINTN            ExTokenNumber,

   IN UINTN            GetSize

   )

-{

-  if (!FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {

-    ASSERT (FALSE);

-    return 0;

-  }

-  

+{ 

   return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);

 }

 

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 094043f..90ab529 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -204,7 +204,7 @@ CreateQuestion (
   // Take a look at next OpCode to see whether it is a GUIDed opcode to support

   // Framework Compatibility

   //

-  if (FeaturePcdGet (PcdFrameworkHiiCompatibilitySupport)) {

+  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {

     if ((*OpCodeData == EFI_IFR_NUMERIC_OP) && IsNextOpCodeGuidedVarEqName (OpCodeData)) {

       Status = UpdateCheckBoxStringToken (FormSet, Statement);

       if (EFI_ERROR (Status)) {

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 78a7a83..7b027a4 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -77,7 +77,7 @@
   gEfiConsoleControlProtocolGuid                ## CONSUMES

 

 [FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport

 

 [Depex]

   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid