EmbeddedPkg/MmcDxe: Improved parameters checking

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.dsc

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index bd709334a0cf57eb28cbecc2ca914c11b818b094..cc0d4e8b1bd1a45ce8d70e2523da521fa47ec9d1 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -173,6 +173,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables|FALSE\r
 \r
 [PcdsFixedAtBuild]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040\r
@@ -234,18 +235,6 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10\r
 \r
 \r
-!ifndef $(SKIP_MAIN_BUILD)\r
-[Components.X64]\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
-    <LibraryClasses>\r
-      # turn off CR3 write so that DXE IPL will not crash emulator\r
-      BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf\r
-  }\r
-\r
-[Components.IA32]\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
-!endif\r
-\r
 [Components]\r
 !ifdef $(UNIX_SEC_BUILD)\r
   ##\r
@@ -278,6 +267,7 @@
   EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf\r
   EmulatorPkg/FlashMapPei/FlashMapPei.inf\r
   EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
   ##\r
   #  DXE Phase modules\r
@@ -285,6 +275,8 @@
   MdeModulePkg/Core/Dxe/DxeMain.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
+      SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf\r
+      DxeEmuLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf\r
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
       NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   }\r
@@ -395,7 +387,8 @@
       ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
       SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
-      MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf\r
+      PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf\r
+#      MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf\r
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf\r
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf\r
 \r