Merge R8->R9 tracker 5935 and 7080 to update runtime arch protocol to DxeCis 0.91...

[mirror_edk2.git] / EdkModulePkg / Core / DxeIplPeim / DxeIpl.msa

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index bbf6cf1f444756aef6f8d800e2c6baba986ffa17..574d5460fd87ddaa18d66988704cd7229b283a58 100644 (file)
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -77,8 +77,6 @@
     <Filename>DxeIpl.dxs</Filename>\r
     <Filename SupArchList="IA32 X64 EBC">Ia32/ImageRead.c</Filename>\r
     <Filename SupArchList="IA32">Ia32/DxeLoadFunc.c</Filename>\r
-    <Filename SupArchList="IA32">Ia32/LongMode.asm</Filename>\r
-    <Filename ToolChainFamily="GCC" SupArchList="IA32">Ia32/LongMode.S</Filename>\r
     <Filename SupArchList="IA32">Ia32/VirtualMemory.c</Filename>\r
     <Filename SupArchList="IA32">Ia32/VirtualMemory.h</Filename>\r
     <Filename SupArchList="X64 EBC">X64/DxeLoadFunc.c</Filename>\r
@@ -145,7 +143,7 @@
     <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">\r
       <C_Name>PcdDxeIplBuildShareCodeHobs</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <DefaultValue>TRUE</DefaultValue>\r
+      <DefaultValue>FALSE</DefaultValue>\r
       <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>\r
     </PcdEntry>\r
     <PcdEntry PcdItemType="FEATURE_FLAG" Usage="ALWAYS_CONSUMED">\r