Fix bug where { NULL } did not terminate with a double NULL. Add support for passing...

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.dsc

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index 5f7e4b0d98b61b1ddb88686f38d243802a21f9e0..d3a90189670cc91b10815940e0cd01fe7550f59e 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -21,7 +21,7 @@
   PLATFORM_NAME                  = EmulatorPkg\r
   PLATFORM_GUID                  = 05FD064D-1073-E844-936C-A0E16317107D\r
   PLATFORM_VERSION               = 0.3\r
-  DSC_ SPECIFICATION             = 0x00010005\r
+  DSC_SPECIFICATION              = 0x00010005\r
 !if $(BUILD_32)\r
   OUTPUT_DIRECTORY               = Build/Emulator32\r
 !else\r
@@ -99,6 +99,7 @@
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf\r
   PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf\r
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf\r
 \r
 \r
 [LibraryClasses.common.SEC]\r
@@ -172,9 +173,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables|FALSE\r
 \r
 [PcdsFixedAtBuild]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x1f\r
@@ -231,20 +233,7 @@
 [PcdsDynamicHii.common.DEFAULT]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEmuSystemConfigGuid|0x0|80\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEmuSystemConfigGuid|0x4|25\r
-  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
@@ -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