Enabled PCD DXE/PEI modules build in MdeModulePkg

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

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 31ec78dd4f92651abd3f83b0678bf46efb6c8b42..cbcc2454609d3faf898445653accd1c15da77c3f 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -291,6 +291,12 @@
   PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|TRUE\r
   PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|TRUE\r
   PcdSupportUpdateCapsuleRest|gEfiEdkModulePkgTokenSpaceGuid|FALSE\r
+  PcdDxePcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseGetSizeEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseExEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
 \r
 #  PcdStatusCodeUseOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r
 \r
@@ -317,6 +323,8 @@
   PcdFlashNvStorageVariableBase|gEfiGenericPlatformTokenSpaceGuid|0x0\r
   PcdFlashNvStorageVariableSize|gEfiGenericPlatformTokenSpaceGuid|0x0\r
   PcdMaxPeiPerformanceLogEntries|gEfiEdkModulePkgTokenSpaceGuid|28\r
+  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiEdkModulePkgTokenSpaceGuid|0x08\r
 \r
 [PcdsPatchableInModule.common]\r
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000\r
@@ -356,6 +364,8 @@
   ${WORKSPACE}/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf\r
   ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf\r
   ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 \r
 [Components.X64]\r
   ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
@@ -364,4 +374,4 @@
   ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
 [Components.EBC]\r
-  ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
\ No newline at end of file
+  ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
index 962572d3cb0d22f494e90d6b5ac8fff5cd98b336..b35efc5291f7b5a60b19f0363b5996569f41e000 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
@@ -48,7 +48,11 @@
   ComponentName.c\r
   DiskIo.h\r
   DiskIo.c\r
-\r
+  Inventory.vfr\r
+  InventoryStrings.uni\r
+  NVDataStruc.h\r
+  Vfr.vfr\r
+  VfrStrings.uni\r
 \r
 ################################################################################\r
 #\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 6b4103566edbea1dd54f86e40feb6bd8b39332a6..df39c1fc3a77ec7045a230e3b7381a97c9bed9a2 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -25,7 +25,7 @@
   FILE_GUID                      = 80CF7257-87AB-47f9-A3FE-D50B76D89541\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  PCD_DRIVER                     = DXE_PCD_DRIVER\r
+  PCD_IS_DRIVER                  = DXE_PCD_DRIVER\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index da38053e13b6679614a04ec954eb5ff99fbb57fa..ff2ae79e5bd63ac945e094d02b96859a66c03d1b 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -34,7 +34,7 @@ Module Name: Service.h
 // and generated by PCD Database generation tool.\r
 //\r
 #if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)\r
-  #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
+//  #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 506ab026cd5102fd1df2b0287a8c95c2e4384d0b..d92e115db1cf34232a2eec2716c549111323a7ec 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -25,7 +25,7 @@
   FILE_GUID                      = 9B3ADA4F-AE56-4c24-8DEA-F03B7558AE50\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
-  PCD_DRIVER                     = PEI_PCD_DRIVER\r
+  PCD_IS_DRIVER                  = PEI_PCD_DRIVER\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
@@ -60,6 +60,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
 \r
 ################################################################################\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 9c3c70a0d0fbf141486b084cf0734fb0106c06ab..334c399436215f48c6d03ade00a1057a54356938 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -34,7 +34,7 @@ Module Name: Service.h
 // and generated by PCD Database generation tool.\r
 //\r
 #if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION )\r
-  #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"\r
+//  #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"\r
 #endif\r
 \r
 //\r