EmulatorPkg: Remove UnixPkg instance of the BaseLib and use PcdDxeIplBuildPageTables.

PcdDxeIplBuildPageTables made UnixPkg BaseLib changes obsolete, so we should remove it, and clean up the .dsc file to treat the DxeIpl as a normal PEIM.

signed-off-by: andrewfish

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

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index 5f7e4b0d98b61b1ddb88686f38d243802a21f9e0..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