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
This commit is contained in:
@@ -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;
|
||||
|
@@ -57,9 +57,6 @@
|
||||
[Protocols]
|
||||
gPcdProtocolGuid ## PRODUCES
|
||||
|
||||
[FeaturePcd.common]
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled
|
||||
|
||||
[FixedPcd.common]
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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)) {
|
||||
|
@@ -77,7 +77,7 @@
|
||||
gEfiConsoleControlProtocolGuid ## CONSUMES
|
||||
|
||||
[FeaturePcd.common]
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
|
||||
|
||||
[Depex]
|
||||
gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid
|
||||
|
Reference in New Issue
Block a user