1 files changed, 15 insertions, 9 deletions
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 01b61af697..5c14254a0c 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>
     <Abstract>Component description file for DebugSupport module.</Abstract>
     <Description>This driver installs DebugSupport protocol for the selected processor.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -17,35 +17,38 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
   <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
     <OutputFileBasename>DebugSupport</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a">
       <Keyword>BaseMemoryLib</Keyword>
+      <HelpText>Recommended libary Instance is DxeMemoryLib instance in MdePkg.</HelpText>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="4674739d-3195-4fb2-8094-ac1d22d00194">
       <Keyword>MemoryAllocationLib</Keyword>
+      <HelpText>Recommended libary Instance is DxeMemoryAllocationLib instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64 IPF EBC">
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">
       <Keyword>BaseLib</Keyword>
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>DebugSupport.c</Filename>
     <Filename>DebugSupport.dxs</Filename>
-    <Filename SupArchList="IA32">Ia32/AsmFuncs.asm</Filename>
-    <Filename SupArchList="IA32">Ia32/AsmFuncs.S</Filename>
+    <Filename ToolChainFamily="MSFT" SupArchList="IA32">Ia32/AsmFuncs.asm</Filename>
+    <Filename ToolChainFamily="GCC" SupArchList="IA32">Ia32/AsmFuncs.S</Filename>
     <Filename SupArchList="IA32">Ia32/plDebugSupport.h</Filename>
     <Filename SupArchList="IA32">Ia32/plDebugSupport.c</Filename>
     <Filename SupArchList="IPF">ipf/AsmFuncs.s</Filename>
@@ -60,11 +63,14 @@
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="SOMETIMES_PRODUCED">
       <ProtocolCName>gEfiDebugSupportProtocolGuid</ProtocolCName>
+      <HelpText>If the debug support protocol for this processor type is not 
+        already installed, this protocol will be installed. Otherwise, it will
+        be not installed again.
+      </HelpText>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>