summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EdkModulePkg/Universal/PCD/Dxe/Service.h4
-rw-r--r--EdkModulePkg/Universal/PCD/Pei/Service.h4
-rw-r--r--Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index bfeb81d..8796aff 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -22,13 +22,13 @@ Module Name: Service.h
// Please make sure the PCD Serivce PEIM Version is consistent with
// the version of PCD Database generation tool
//
-#define PCD_DXE_SERVICE_DRIVER_VERSION 2
+#define PCD_SERVICE_DXE_DRIVER_VERSION 2
//
// PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h
// and generated by PCD Database generation tool.
//
-#if (PCD_DXE_SERVICE_PEIM_VERSION != PCD_DXE_DATABASE_GENTOOL_VERSION)
+#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)
#error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"
#endif
diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index 39737ac..674197b 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -22,13 +22,13 @@ Module Name: Service.h
// Please make sure the PCD Serivce PEIM Version is consistent with
// the version of PCD Database generation tool
//
-#define PCD_PEI_SERVICE_DRIVER_VERSION 2
+#define PCD_SERVICE_PEIM_VERSION 2
//
// PCD_PEI_DATABASE_GENTOOL_VERSION is defined in Autogen.h
// and generated by PCD Database generation tool.
//
-#if (PCD_PEI_SERVICE_PEIM_VERSION != PCD_PEI_DATABASE_GENTOOL_VERSION)
+#if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION )
#error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"
#endif
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
index e03317b..d848d1f5 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
@@ -1205,7 +1205,7 @@ public class PcdDatabase {
hString += result.get("initDeclStr");
hString += result.get("uninitDeclStr");
- hString += String.format("#define PCD_%s_SERVICE_DRIVER_VERSION %d", phase, version);
+ hString += String.format("#define PCD_%s_SERVICE_DRIVER_AUTOGEN_VERSION %d", phase, version);
cString = newLine + newLine + result.get("initInstStr");