diff options
| author | Star Zeng <star.zeng@intel.com> | 2013-11-20 02:04:23 +0000 |
|---|---|---|
| committer | lzeng14 <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-11-20 02:04:23 +0000 |
| commit | 61d8989f879e80250f0582129a46381d83fdf9af (patch) | |
| tree | 42687ec05f6e49890d2e75dcae1a49eb40ee22b7 /MdeModulePkg/Universal/PCD | |
| parent | a4d5fa17f41ef641249c7e2db795eed7bd55f3e5 (diff) | |
| download | edk2-61d8989f879e80250f0582129a46381d83fdf9af.tar.gz edk2-61d8989f879e80250f0582129a46381d83fdf9af.tar.bz2 edk2-61d8989f879e80250f0582129a46381d83fdf9af.zip | |
MdeModulePkg and Nt32Pkg Pcd: Add the new EFI_GET_PCD_INFO_PROTOCOL and EFI_GET_PCD_INFO_PPI support for PI 1.2.1 compliance.
It has no obviously benefit to reduce size by PcdPcdInfoGeneration, so remove this PCD.
And PCD_INFO_GENERATION flag can be used to enable/disable PCD info feature, a sample is added in Nt32Pkg to show how to use this flag.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14869 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/PCD')
| -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 |
6 files changed, 6 insertions, 19 deletions
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 ();
|