From be82f9ff2bd9251b2092f86debc13983621562b0 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 3 Jul 2007 09:29:45 +0000
Subject: [PATCH] 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
---
 MdeModulePkg/MdeModulePkg.dsc                     | 12 +++++++++++-
 MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf |  6 +++++-
 MdeModulePkg/Universal/PCD/Dxe/Pcd.inf            |  2 +-
 MdeModulePkg/Universal/PCD/Dxe/Service.h          |  2 +-
 MdeModulePkg/Universal/PCD/Pei/Pcd.inf            |  3 ++-
 MdeModulePkg/Universal/PCD/Pei/Service.h          |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 31ec78dd4f..cbcc245460 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -291,6 +291,12 @@
   PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|TRUE
   PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|TRUE
   PcdSupportUpdateCapsuleRest|gEfiEdkModulePkgTokenSpaceGuid|FALSE
+  PcdDxePcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
+  PcdPeiPcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
+  PcdPeiPcdDatabaseSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
+  PcdPeiPcdDatabaseGetSizeEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
+  PcdPeiPcdDatabaseExEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE
 
 #  PcdStatusCodeUseOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE
 
@@ -317,6 +323,8 @@
   PcdFlashNvStorageVariableBase|gEfiGenericPlatformTokenSpaceGuid|0x0
   PcdFlashNvStorageVariableSize|gEfiGenericPlatformTokenSpaceGuid|0x0
   PcdMaxPeiPerformanceLogEntries|gEfiEdkModulePkgTokenSpaceGuid|28
+  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid|0x0
+  PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiEdkModulePkgTokenSpaceGuid|0x08
 
 [PcdsPatchableInModule.common]
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000
@@ -356,6 +364,8 @@
   ${WORKSPACE}/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
   ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf
   ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf
+  $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
 
 [Components.X64]
   ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
@@ -364,4 +374,4 @@
   ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 
 [Components.EBC]
-  ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
\ No newline at end of file
+  ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
diff --git a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
index 962572d3cb..b35efc5291 100644
--- a/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf
@@ -48,7 +48,11 @@
   ComponentName.c
   DiskIo.h
   DiskIo.c
-
+  Inventory.vfr
+  InventoryStrings.uni
+  NVDataStruc.h
+  Vfr.vfr
+  VfrStrings.uni
 
 ################################################################################
 #
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 6b4103566e..df39c1fc3a 100644
--- 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
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  PCD_DRIVER                     = DXE_PCD_DRIVER
+  PCD_IS_DRIVER                  = DXE_PCD_DRIVER
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index da38053e13..ff2ae79e5b 100644
--- 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.
 //
 #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"
+//  #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"
 #endif
 
 //
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 506ab026cd..d92e115db1 100644
--- 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
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  PCD_DRIVER                     = PEI_PCD_DRIVER
+  PCD_IS_DRIVER                  = PEI_PCD_DRIVER
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
@@ -60,6 +60,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  IntelFrameworkPkg/IntelFrameworkPkg.dec
 
 
 ################################################################################
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 9c3c70a0d0..334c399436 100644
--- 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.
 //
 #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"
+//  #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"
 #endif
 
 //
-- 
2.39.2