Use gEfiMdeModulePkgTokenSpaceGuid instead of gEfiEdkModulePkgTokenSpaceGuid.

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

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
index df9f15a9abf70b543ff61fffda724ef0d910f17c..fe224c28dee9154da8e00f3e55181c82f37fdc84 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -114,5 +114,5 @@
 ################################################################################\r
 \r
 [PcdsDynamic.common]\r
-  PcdMaxPeiPerformanceLogEntries|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index 07c08413d65ac8c530cd36e0de3cb4b048ae4570..ec648bd580c8b0c48c5e65dbea73290c5f496ce3 100644 (file)
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -101,5 +101,5 @@
 ################################################################################\r
 \r
 [PcdsDynamic.common]\r
-  PcdMaxPeiPerformanceLogEntries|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 05aaf8ed6415e72e4f0b8c21b6efea2ecb30f8cd..4ace8bf3bdca8ba3b2927bf18178329a3d034b5a 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -119,27 +119,27 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-  PcdSupportUpdateCapsuleRest|0x0001001d|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
-  PcdPeiPcdDatabaseTraverseEnabled|0x00010020|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdDxePcdDatabaseTraverseEnabled|0x00010021|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdPeiPcdDatabaseSetEnabled|0x00010030|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdPeiPcdDatabaseGetSizeEnabled|0x00010031|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdPeiPcdDatabaseCallbackOnSetEnabled|0x00010032|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdPeiPcdDatabaseExEnabled|0x00010033|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdSupportUpdateCapsuleRest|0x0001001d|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdPeiPcdDatabaseTraverseEnabled|0x00010020|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdDxePcdDatabaseTraverseEnabled|0x00010021|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdPeiPcdDatabaseSetEnabled|0x00010030|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdPeiPcdDatabaseGetSizeEnabled|0x00010031|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|0x00010032|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
+  PcdPeiPcdDatabaseExEnabled|0x00010033|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
   PcdDxeIplSupportEfiDecompress|0x00010034|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
   PcdDxeIplSupportTianoDecompress|0x00010035|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
   PcdDxeIplSupportCustomDecompress|0x00010036|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE\r
-  PcdDevicePathSupportDevicePathToText|0x00010037|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
-  PcdDevicePathSupportDevicePathFromText|0x00010038|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdDevicePathSupportDevicePathToText|0x00010037|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdDevicePathSupportDevicePathFromText|0x00010038|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
   PcdDxeIplBuildShareCodeHobs|0x0001003c|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
-  PcdNtEmulatorEnable|0x0001003e|gEfiEdkModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
+  PcdNtEmulatorEnable|0x0001003e|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE\r
 \r
 [PcdsFixedAtBuild.common]\r
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x0001000f|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x08\r
-  PcdVpdBaseAddress|0x00010010|gEfiEdkModulePkgTokenSpaceGuid|UINT32|0x0\r
-  PcdMaxSizePopulateCapsule|0x0001001e|gEfiEdkModulePkgTokenSpaceGuid|UINT32|0x0\r
-  PcdMaxSizeNonPopulateCapsule|0x0001001f|gEfiEdkModulePkgTokenSpaceGuid|UINT32|0x0\r
-  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiEdkModulePkgTokenSpaceGuid|UINT8|28\r
+  PcdVpdBaseAddress|0x00010010|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
+  PcdMaxSizePopulateCapsule|0x0001001e|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
+  PcdMaxSizeNonPopulateCapsule|0x0001001f|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
+  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiMdeModulePkgTokenSpaceGuid|UINT8|28\r
   PcdFlashNvStorageVariableBase|0x30000001|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
   PcdFlashNvStorageVariableSize|0x30000002|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
   PcdFlashNvStorageFtwSpareBase|0x30000013|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
@@ -156,7 +156,7 @@
   PcdFlashNvStorageFtwWorkingSize|0x30000011|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
 \r
 [PcdsPatchableInModule.common]\r
-  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiEdkModulePkgTokenSpaceGuid|UINT8|28\r
+  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiMdeModulePkgTokenSpaceGuid|UINT8|28\r
   PcdFlashNvStorageVariableBase|0x30000001|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
   PcdFlashNvStorageVariableSize|0x30000002|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r
   PcdFlashNvStorageFtwSpareBase|0x30000013|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0\r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 9d2a0280e663572ff72a538b2a41759ddd18f4e2..88b7d1ab4789d9ef194052ae601b6f301f47750d 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -302,16 +302,16 @@
   PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid|FALSE\r
   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
-  PcdNtEmulatorEnable|gEfiEdkModulePkgTokenSpaceGuid|FALSE\r
-  PcdDevicePathSupportDevicePathFromText|gEfiEdkModulePkgTokenSpaceGuid|FALSE\r
-  PcdDevicePathSupportDevicePathToText|gEfiEdkModulePkgTokenSpaceGuid|FALSE\r
+  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE\r
+  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid|FALSE\r
+  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid|FALSE\r
+  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid|FALSE\r
   PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
   PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid|FALSE  \r
   PcdDxeIplSupportEfiDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
@@ -337,16 +337,16 @@
   PcdPciExpressBaseAddress|gEfiMdePkgTokenSpaceGuid|0xE0000000\r
   PcdFSBClock|gEfiMdePkgTokenSpaceGuid|200000000\r
   PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320\r
-  PcdMaxSizeNonPopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
-  PcdMaxSizePopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
-  PcdMaxPeiPerformanceLogEntries|gEfiEdkModulePkgTokenSpaceGuid|28\r
-  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid|28\r
+  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid|0x08\r
   PcdStatusCodeValueEfiWatchDogTimerExpired|gEfiMdePkgTokenSpaceGuid|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED\r
   PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid|0x00051006         # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP\r

diff --git a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
index 61dae1b849134697e1c0a7fbaaaf92ecdedc4956..7c257f866c60662634a4bd7e39468fd118e93b8c 100644 (file)
--- a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
+++ b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
@@ -66,11 +66,11 @@
   gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [PcdsFeatureFlag.common]\r
-  PcdSupportUpdateCapsuleRest|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 [PcdsFixedAtBuild.common]\r
-  PcdMaxSizeNonPopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdMaxSizePopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 [Depex]\r
   gEfiVariableArchProtocolGuid\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf
index 005539bed08aeb2890b86f87e9a548d7ae2f31e1..22b07922b5564044736b7681f5cd46e76cbf2a35 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf
@@ -118,7 +118,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.IA32]\r
-  PcdNtEmulatorEnable|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 \r
 ################################################################################\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
index 7f76d4f0e70805d108d8303fea93c237141e1a02..98c3f1a60c8fe9c3528d79ce2f97631dcc8729d5 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
@@ -117,6 +117,6 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-  PcdDevicePathSupportDevicePathFromText|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdDevicePathSupportDevicePathToText|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index df39c1fc3a77ec7045a230e3b7381a97c9bed9a2..f5502e5028f5be4ea6d7110baa48aec4ac4b2b5e 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -110,7 +110,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-  PcdDxePcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 \r
 ################################################################################\r
@@ -120,7 +120,7 @@
 ################################################################################\r
 \r
 [PcdsFixedAtBuild.common]\r
-  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 \r
 ################################################################################\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index ac32ad724d52746a0d3a189b1898a0c9ca962919..64c01458b54d266a5c6e9334b79b80e60528157e 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -111,11 +111,11 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-  PcdPeiPcdDatabaseSetEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdPeiPcdDatabaseGetSizeEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdPeiPcdDatabaseExEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
-  PcdPeiPcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 \r
 ################################################################################\r
@@ -125,7 +125,7 @@
 ################################################################################\r
 \r
 [PcdsFixedAtBuild.common]\r
-  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid\r
+  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 \r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 41e13ca07c1b59c351bdc64315c972647d1360f2..ed268dd8445318cdfc30c0c651a8da451865d6da 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -266,9 +266,9 @@
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000040\r
   PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0\r
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid|0x08\r
-  PcdVpdBaseAddress|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
-  PcdMaxSizeNonPopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
-  PcdMaxSizePopulateCapsule|gEfiEdkModulePkgTokenSpaceGuid|0x0\r
+  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
+  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdPciIncompatibleDeviceSupportMask|gEfiIntelFrameworkModulePkgTokenSpaceGuid|0\r
   PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid|0x0\r
   PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid|0x280000\r
@@ -278,11 +278,11 @@
   PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x00c000\r
 \r
 [PcdsFeatureFlag.IA32]\r
-  PcdPeiPcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
-  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
-  PcdPeiPcdDatabaseExEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
-  PcdPeiPcdDatabaseGetSizeEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
-  PcdPeiPcdDatabaseSetEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
+  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
   PcdStatusCodeUseSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r
   PcdStatusCodeUseMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r
   PcdStatusCodeUseOEM|gEfiIntelFrameworkModulePkgTokenSpaceGuid|TRUE\r
@@ -291,7 +291,7 @@
   PcdDxeIplSupportTianoDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
   PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
   PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid|TRUE  \r
-  PcdDxePcdDatabaseTraverseEnabled|gEfiEdkModulePkgTokenSpaceGuid|TRUE\r
+  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r
   PcdStatusCodeUseHardSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r
   PcdStatusCodeUseEfiSerial|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r
   PcdStatusCodeUseRuntimeMemory|gEfiIntelFrameworkModulePkgTokenSpaceGuid|FALSE\r