diff options
| -rw-r--r-- | MdeModulePkg/MdeModulePkg.dec | 6 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Dxe/Pcd.c | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Dxe/Service.c | 4 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Pcd.c | 7 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Service.c | 4 | ||||
| -rw-r--r-- | Nt32Pkg/Nt32Pkg.dsc | 6 |
8 files changed, 12 insertions, 25 deletions
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 68377aaf36..b627eb101c 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -376,12 +376,6 @@ gEdkiiFormBrowserEx2ProtocolGuid = { 0xa770c357, 0xb693, 0x4e6d, { 0xa6, 0xcf, 0xd2, 0x1c, 0x72, 0x8e, 0x55, 0xb } }
[PcdsFeatureFlag]
- ## Indicates if the Pcd Info Ppi and Protocol should be produced.<BR><BR>
- # It can be disabled to save size.<BR><BR>
- # TRUE - Pcd Info Ppi and Protocol will be produced.<BR>
- # FALSE - Pcd Info Ppi and Protocol will not be produced.<BR>
- gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration|FALSE|BOOLEAN|0x0001001C
-
## Indicate whether platform can support update capsule across a system reset
gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c index afe925c5e2..8a3e8cd500 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c @@ -150,7 +150,10 @@ PcdDxeInit ( );
ASSERT_EFI_ERROR (Status);
- if (FeaturePcdGet (PcdPcdInfoGeneration) && mPcdDatabase.DxeDb->PcdNameTableOffset != 0) {
+ //
+ // Only install PcdInfo PROTOCOL when PCD info content is present.
+ //
+ if (mPcdDatabase.DxeDb->PcdNameTableOffset != 0) {
//
// Install GET_PCD_INFO_PROTOCOL to handle dynamic type PCD
// Install EFI_GET_PCD_INFO_PROTOCOL to handle dynamicEx type PCD
@@ -228,9 +231,6 @@ DxeGetPcdInfoGetSku ( VOID
)
{
- if (!FeaturePcdGet (PcdPcdInfoGeneration)) {
- return EFI_UNSUPPORTED;
- }
return mPcdDatabase.PeiDb->SystemSkuId;
}
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf index 8565b30307..2b8d83c12b 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -340,7 +340,6 @@ [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress ## SOMETIMES_CONSUMES
- gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration
[Depex]
TRUE
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c index 43a3bda776..54c814b562 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c @@ -283,10 +283,6 @@ DxeGetPcdInfo ( UINT32 LocalTokenNumber;
BOOLEAN IsPeiDb;
- if (!FeaturePcdGet (PcdPcdInfoGeneration)) {
- return EFI_UNSUPPORTED;
- }
-
ASSERT (PcdInfo != NULL);
Status = EFI_NOT_FOUND;
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 ();
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 59ee48741b..63e5108371 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -31,6 +31,12 @@ BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Nt32Pkg/Nt32Pkg.fdf
+ //
+ // This flag is to control tool to generate PCD info for dynamic(ex) PCD,
+ // then enable or disable PCD info feature. TRUE is enable, and FLASE is disable.
+ // If the flag is absent, it will be same as FALSE.
+ //
+ PCD_INFO_GENERATION = TRUE
#
# Defines for default states. These can be changed on the command line.
|