summaryrefslogtreecommitdiff
path: root/EdkModulePkg
diff options
context:
space:
mode:
authorqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2006-06-26 10:18:28 +0000
committerqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2006-06-26 10:18:28 +0000
commit24e25d11c0460dfb39fade685375c0e58cbcb40e (patch)
treea3e931c8113a9184433b347bacff079df18acac9 /EdkModulePkg
parent23f52b03b4202e4dc5af440a90f0b0864a45dbdd (diff)
downloadedk2-platforms-24e25d11c0460dfb39fade685375c0e58cbcb40e.tar.xz
• BaseMemoryLib:
Modify some Aassert()s conditions to sync with MWG 0.56d Modify some defects in function header. • PostCodeLib: Implement PeiDxePostCodeLibReportStatusCode. • Misc Rename BaseDebugLibReportStatusCode to PeiDxeDebugLibReportStatusCode Remove tabs in all .c and .h files in MdePkg. Rename PeiServicesReinstallPpi() to PeiServicesReInstallPpi() Adjust some minor coding style in PeCoffLoaderGetEntryPointerLib() git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@626 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg')
-rw-r--r--EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.mbd2
-rw-r--r--EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd2
-rw-r--r--EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.mbd2
-rw-r--r--EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.mbd2
-rw-r--r--EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.mbd2
-rw-r--r--EdkModulePkg/Core/Dxe/DxeMain.mbd2
-rw-r--r--EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd2
-rw-r--r--EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd2
-rw-r--r--EdkModulePkg/Core/Pei/PeiMain.mbd2
-rw-r--r--EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd2
-rw-r--r--EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd2
-rw-r--r--EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd2
-rw-r--r--EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd2
-rw-r--r--EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd2
-rw-r--r--EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd2
-rw-r--r--EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd2
-rw-r--r--EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd2
-rw-r--r--EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd2
-rw-r--r--EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd2
-rw-r--r--EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd2
-rw-r--r--EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd2
-rw-r--r--EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd2
-rw-r--r--EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd2
-rw-r--r--EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd2
-rw-r--r--EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd2
-rw-r--r--EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd2
-rw-r--r--EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd2
-rw-r--r--EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd2
-rw-r--r--EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd2
-rw-r--r--EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd2
-rw-r--r--EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd2
-rw-r--r--EdkModulePkg/Universal/PCD/Pei/Pcd.mbd2
-rw-r--r--EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd2
-rw-r--r--EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd2
-rw-r--r--EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd2
-rw-r--r--EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd2
-rw-r--r--EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd2
-rw-r--r--EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd2
-rw-r--r--EdkModulePkg/Universal/Variable/Pei/Variable.mbd2
-rw-r--r--EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.mbd2
-rw-r--r--EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd2
-rw-r--r--EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd2
54 files changed, 54 insertions, 54 deletions
diff --git a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.mbd b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.mbd
index 903a092439..6de42bb9bb 100644
--- a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.mbd
+++ b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.mbd b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.mbd
index 16bc2891b6..a8757d7b73 100644
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.mbd
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.mbd b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.mbd
index f6e3ba1c8a..b9ad38fffa 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.mbd
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.mbd b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.mbd
index eea4971cbf..2bed01a330 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.mbd
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>UefiDevicePathLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.mbd b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.mbd
index 41543f7832..d343fd581a 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.mbd
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.mbd b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.mbd
index c02965265c..3e2db59a4c 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.mbd
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>UefiDevicePathLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.mbd b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.mbd
index 76d35e7455..e0ea5838b7 100644
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.mbd
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
index c4dfccb97e..8127eb0911 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeHobLib</Library>
diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.mbd b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.mbd
index 0254903cd1..1681a92a1e 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.mbd
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkScsiLib</Library>
diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.mbd b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.mbd
index ec19f96872..87b9331c24 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.mbd
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkScsiLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.mbd b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.mbd
index 1d18c75266..c853ed4dc5 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.mbd b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.mbd
index 4e46c13f97..405aab5014 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.mbd b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.mbd
index 17a63f9b21..935e3b5c8d 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.mbd b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.mbd
index e48251eb07..416976a869 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.mbd b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.mbd
index ecb6af6c96..7a26566d95 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.mbd b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.mbd
index c9c9b5c73b..e77c35d60e 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.mbd b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.mbd
index 88b3e47a97..026a9bf68c 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.mbd
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>EdkUsbLib</Library>
diff --git a/EdkModulePkg/Core/Dxe/DxeMain.mbd b/EdkModulePkg/Core/Dxe/DxeMain.mbd
index 55967cacde..9b0d2b1550 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.mbd
+++ b/EdkModulePkg/Core/Dxe/DxeMain.mbd
@@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>BaseLib</Library>
<Library>BaseCacheMaintenanceLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library OverrideID="1111">DxeCoreUefiDecompressLibFromHob</Library>
<Library OverrideID="1111">DxeCoreTianoDecompressLibFromHob</Library>
<Library OverrideID="3333">DxeCoreCustomDecompressLibFromHob</Library>
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd
index 36219e68c3..cf9205a26c 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.mbd
@@ -37,7 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>BaseUefiTianoDecompressLib</Library>
<Library>BaseCustomDecompressLibNull</Library>
<Library>PeiReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>PeiMemoryAllocationLib</Library>
<Arch ArchType="IA32">
diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
index 460044147c..3544ee0d55 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIplX64.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>BaseCacheMaintenanceLib</Library>
<Library>BaseUefiTianoDecompressLib</Library>
<Library>BaseCustomDecompressLibNull</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>PeiMemoryAllocationLib</Library>
<Library>PeiReportStatusCodeLib</Library>
diff --git a/EdkModulePkg/Core/Pei/PeiMain.mbd b/EdkModulePkg/Core/Pei/PeiMain.mbd
index 4bf137aa9f..5b6d2c2074 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.mbd
+++ b/EdkModulePkg/Core/Pei/PeiMain.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>PeiServicesLib</Library>
<Library>PeiHobLib</Library>
<Library>PeiReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BasePerformanceLibNull</Library>
<Arch ArchType="IA32">
<Library OverrideID="6666">BasePeCoffGetEntryPointLib</Library>
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd
index d4b36b6f8f..6da93681ff 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd
index 4b240ac60b..b23fd9220c 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>HiiLib</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd
index 7ec90ab781..230399e76e 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd
index 39b2c9393b..d117880c41 100644
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd
+++ b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd
index 8d03e0cf3b..3df19f1dc0 100644
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd
+++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.mbd
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiMemoryLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
</Libraries>
<BuildOptions ToolChain="MSFT">
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd
index a38bf30903..db485cb445 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.mbd
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiMemoryLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
<BuildOptions ToolChain="MSFT">
diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd
index 62abeee2d6..5a5f505ca5 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>UefiDevicePathLib</Library>
diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd
index 087bedf5bb..5cddc5ae37 100644
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd
+++ b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd b/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd
index ed89f0716e..160f4673d7 100644
--- a/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd
+++ b/EdkModulePkg/Universal/Disk/DiskIoPartition/Dxe/DiskIoPartition.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>UefiDevicePathLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd
index 7be0d52c92..628c2ff3de 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.mbd
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverModelLib</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>UefiDevicePathLib</Library>
</Libraries>
</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd
index 46b51cffdd..4d6e50b1b9 100644
--- a/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd
+++ b/EdkModulePkg/Universal/Disk/UnicodeCollation/English/Dxe/English.mbd
@@ -33,6 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiMemoryLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
</Libraries>
</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd
index 61073596f3..a8ac736d1a 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ebc.mbd
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd
index 4cc2c2085d..5bac48fd55 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.mbd
@@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Libraries>
<Library>UefiBootServicesTableLib</Library>
<Library>BaseMemoryLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd
index a56e9defc0..fa4818868c 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd
index 67ea3cd4b9..ba3ea42682 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.mbd
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd
index 2b770fe63d..ff035c5900 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Dxe/NullMemoryTest.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>DxeServicesTableLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
<BuildOptions ToolChain="MSFT">
diff --git a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
index ac15f7b7e0..2a8595985d 100644
--- a/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
+++ b/EdkModulePkg/Universal/GenericMemoryTest/Pei/BaseMemoryTest.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Libraries>
<Library>PeimEntryPoint</Library>
<Library>PeiReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>PeiServicesTablePointerLib</Library>
<Library>PeiMemoryLib</Library>
<Library>PeiServicesLib</Library>
diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd
index 6a5fa71a76..2c298e2dd0 100644
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd
+++ b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Arch ArchType="IPF">
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd
index 2262fc64c7..94e8e7cff4 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd
index 090884a8a8..eda3e289f8 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd
index 293812b304..5d4985bb63 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiDriverModelLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>DxeMemoryAllocationLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd b/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd
index 162339574a..5306a8f9a2 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.mbd
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiMemoryLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
</Libraries>
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
index 8509b16d73..e28c1b9c4d 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
@@ -33,7 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>PeiServicesLib</Library>
<Library OverrideID="4444">PeiServicesTablePointerLib</Library>
<Library>PeiHobLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>PeiMemoryLib</Library>
<Library>PeiReportStatusCodeLib</Library>
<Library>PeiMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd
index 19ac5953f9..0eed93ea84 100644
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>BaseMemoryLib</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Library>UefiDriverEntryPoint</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeReportStatusCodeLib</Library>
<Arch ArchType="IPF">
<Library>EdkDxeSalLib</Library>
diff --git a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd
index 2dc6fe738d..facb62ce8f 100644
--- a/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd
+++ b/EdkModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
</Libraries>
</ModuleBuildDescription>
diff --git a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd
index f4030f4f9e..b35051ba54 100644
--- a/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd
+++ b/EdkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCode.mbd
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>UefiLib</Library>
<Library>BasePrintLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>DxeIoLibCpuIo</Library>
<Library>BaseMemoryLib</Library>
<Library>DxeReportStatusCodeLib</Library>
diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd
index 03f2ed9463..b8d2589b62 100644
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.mbd
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiRuntimeServicesTableLib</Library>
<Library>BaseLib</Library>
<Library>BaseMemoryLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeMemoryAllocationLib</Library>
<Library>DxeReportStatusCodeLib</Library>
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
index f9e28861c5..24ec052551 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BasePrintLib</Library>
<Library>EdkGraphicsLib</Library>
<Library>EdkIfrSupportLib</Library>
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
index 6dc2e36138..ba9532a661 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiRuntimeServicesTableLib</Library>
<Library>BaseLib</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>UefiMemoryLib</Library>
<Library>BasePrintLib</Library>
<Library>UefiDriverEntryPoint</Library>
diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd b/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
index 97bbde871a..d091ef6423 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.mbd
@@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</MbdHeader>
<Libraries>
<Library>PeiReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>BaseLib</Library>
<Library>PeiMemoryLib</Library>
<Library>PeiServicesLib</Library>
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.mbd b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.mbd
index 4cc2c2085d..5bac48fd55 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.mbd
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Emu/EmuVariable.mbd
@@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Libraries>
<Library>UefiBootServicesTableLib</Library>
<Library>BaseMemoryLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
index 7f2ea440e8..4f7bf334bb 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
<Library>DxeServicesTableLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxeRuntimeDriverLib</Library>
<Library>DxeHobLib</Library>
<Library>DxeMemoryAllocationLib</Library>
diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd
index 17bd6ea24f..9a605c91fc 100644
--- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd
+++ b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.mbd
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<Library>UefiLib</Library>
<Library>UefiDriverEntryPoint</Library>
<Library>DxeReportStatusCodeLib</Library>
- <Library>BaseDebugLibReportStatusCode</Library>
+ <Library>PeiDxeDebugLibReportStatusCode</Library>
<Library>EdkDxePrintLib</Library>
</Libraries>
<BuildOptions ToolChain="MSFT">