EfiDriverLib,EfiCopyMem,CopyMem,BaseMemoryLib,MdePkg\r
EfiDriverLib,EfiSetMem,SetMem,BaseMemoryLib,MdePkg\r
EfiDriverLib,EfiZeroMem,ZeroMem,BaseMemoryLib,MdePkg\r
-EfiDriverLib,EfiLibInstallDriverBinding,R8_EfiLibInstallDriverBinding,%,MdePkg\r
-EfiDriverLib,EfiLibInstallAllDriverProtocols,R8_EfiLibInstallAllDriverProtocols,%,MdePkg\r
+EfiDriverLib,EfiLibInstallDriverBinding,EfiLibInstallDriverBinding,UefiLib,MdePkg\r
+EfiDriverLib,EfiLibInstallAllDriverProtocols,EfiLibInstallAllDriverProtocols,UefiLib,MdePkg\r
EfiDriverLib,EfiLibCompareLanguage,R8_EfiLibCompareLanguage,%,MdePkg\r
EfiDriverLib,EfiDevicePathSize,GetDevicePathSize,DevicePathLib,MdePkg\r
EfiDriverLib,EfiDuplicateDevicePath,DuplicateDevicePath,DevicePathLib,MdePkg\r
EfiCommonLib,EfiDebugAssert,DebugAssert,DebugLib,MdePkg\r
EfiCommonLib,EfiDebugPrint,DebugPrint,DebugLib,MdePkg\r
EfiCommonLib,EfiDebugVPrint,DebugVPrint,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_INIT,EFI_D_INIT,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_WARN,EFI_D_WARN,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_LOAD,EFI_D_LOAD,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_FS,EFI_D_FS,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_POOL,EFI_D_POOL,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_PAGE,EFI_D_PAGE,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_INFO,EFI_D_INFO,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_VARIABLE,EFI_D_VARIABLE,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_BM,EFI_D_BM,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_BLKIO,EFI_D_BLKIO,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_NET,EFI_D_NET ,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_UNDI,EFI_D_UNDI,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_LOADFILE,EFI_D_LOADFILE,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_EVENT,EFI_D_EVENT,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_ERROR,EFI_D_ERROR,DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_GENERIC,(EFI_D_ERROR | EFI_D_INIT | EFI_D_WARN | EFI_D_INFO | EFI_D_BLKIO | EFI_D_NET | EFI_D_UNDI),DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_INTRINSIC,(EFI_D_EVENT | EFI_D_POOL | EFI_D_PAGE | EFI_D_LOAD | EFI_D_BM | EFI_D_VARIABLE),DebugLib,MdePkg\r
-EfiCommonLib,EFI_D_RESERVED,((EFI_D_ERROR | EFI_D_INIT | EFI_D_WARN | EFI_D_INFO | EFI_D_BLKIO | EFI_D_NET | EFI_D_UNDI) | (EFI_D_EVENT | EFI_D_POOL | EFI_D_PAGE | EFI_D_LOAD | EFI_D_BM | EFI_D_VARIABLE)),DebugLib,MdePkg\r
-EfiCommonLib,EFI_DBUG_MASK,EFI_D_ERROR,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_INIT,DEBUG_INIT,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_WARN,DEBUG_WARN,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_LOAD,DEBUG_LOAD,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_FS,DEBUG_FS,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_POOL,DEBUG_POOL,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_PAGE,DEBUG_PAGE,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_INFO,DEBUG_INFO,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_VARIABLE,DEBUG_VARIABLE,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_BM,DEBUG_BM,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_BLKIO,DEBUG_BLKIO,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_NET,DEBUG_NET,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_UNDI,DEBUG_UNDI,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_LOADFILE,DEBUG_LOADFILE,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_EVENT,DEBUG_EVENT,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_ERROR,DEBUG_ERROR,DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_GENERIC,(DEBUG_ERROR | DEBUG_INIT | DEBUG_WARN | DEBUG_INFO | DEBUG_BLKIO | DEBUG_NET | DEBUG_UNDI),DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_INTRINSIC,(DEBUG_EVENT | DEBUG_POOL | DEBUG_PAGE | DEBUG_LOAD | DEBUG_BM | DEBUG_VARIABLE),DebugLib,MdePkg\r
+EfiCommonLib,EFI_D_RESERVED,((DEBUG_ERROR | DEBUG_INIT | DEBUG_WARN | DEBUG_INFO | DEBUG_BLKIO | DEBUG_NET | DEBUG_UNDI) | (DEBUG_EVENT | DEBUG_POOL | DEBUG_PAGE | DEBUG_LOAD | DEBUG_BM | DEBUG_VARIABLE)),DebugLib,MdePkg\r
+EfiCommonLib,EFI_DBUG_MASK,DEBUG_ERROR,DebugLib,MdePkg\r
PeiLib,ASPrint,AsciiSPrint,PrintLib,MdePkg\r
PeiLib,AvSPrint,AsciiVSPrint,PrintLib,MdePkg\r
PeiLib,CompareGuid,CompareGuid,BaseMemoryLib,MdePkg\r