From 1fc930834bc7fe1b2cba41b5dc5be7e1716b3840 Mon Sep 17 00:00:00 2001
From: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 11 Aug 2011 03:37:26 +0000
Subject: [PATCH] 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
---
 EmulatorPkg/EmulatorPkg.dsc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index 5f7e4b0d98..cc0d4e8b1b 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -173,6 +173,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables|FALSE
 
 [PcdsFixedAtBuild]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040
@@ -234,18 +235,6 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
 
 
-!ifndef $(SKIP_MAIN_BUILD)
-[Components.X64]
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
-    <LibraryClasses>
-      # turn off CR3 write so that DXE IPL will not crash emulator
-      BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf
-  }
-
-[Components.IA32]
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-!endif
-
 [Components]
 !ifdef $(UNIX_SEC_BUILD)
   ##
@@ -278,6 +267,7 @@
   EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf
   EmulatorPkg/FlashMapPei/FlashMapPei.inf
   EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 
   ##
   #  DXE Phase modules