Clean up MSA for MDE Libs:

1. Remove unreferenced Guid of gEfiStatusCodeDataTypeAssertGuid in PeiReportStatusCodeLib & DxeReportStatusCodeLib.msa
2. Remove dependency of BaseLib for SmmEntryPointerLib & PeiServicesTablePointerLibKr1
3. Add accurate arch support for SecPeiDxeTimerLibCpu & correct PcdFSBClock to "DYNAMIC"
4. Add dependency of gEfiDevicePathProtocolGuid for DevicePathLibDevicePathProtocol
5. Remove dependency of BaseLib & UefiRuntimeServicesTablePointerLib for UefiDriverEntryPointLib

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

diff --git a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
index 377da7d1878b93fa6801f5a911984f370581a3c8..3014952e5107d0e252be3cf7375f1ee59ea7c0c0 100644 (file)
--- a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
+++ b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>DXE report status code library</Abstract>\r
     <Description>Retrieve status code and report status code in DXE phase</Description>\r
     <Version>1.0</Version>\r
     <Abstract>DXE report status code library</Abstract>\r
     <Description>Retrieve status code and report status code in DXE phase</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -53,9 +53,6 @@
     </Protocol>\r
   </Protocols>\r
   <Guids>\r
     </Protocol>\r
   </Protocols>\r
   <Guids>\r

-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeDataTypeAssertGuid</GuidCName>\r
-    </GuidCNames>\r

     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa b/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
index f6b642b3d6ea19a81ca882af5bc15b032b1a8ca9..605579758cbdb8371deb92d0c8e40831df6eec5b 100644 (file)
--- a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
+++ b/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>SMM driver entry point library</Abstract>\r
     <Description>Register driver in SMRAM and wrapper driver library constructors and entry point</Description>\r
     <Version>1.0</Version>\r
     <Abstract>SMM driver entry point library</Abstract>\r
     <Description>Register driver in SMRAM and wrapper driver library constructors and entry point</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DriverEntryPoint.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DriverEntryPoint.c</Filename>\r

diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
index 5ca35af949886d6ef8af754f04cb93c337217a92..cd1015bc3be6a33aaad7532b607ded974a6eebd3 100644 (file)
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Entry point to a the PEI Core</Abstract>\r
     <Description>The library contains the entry point to a PEI core Module Type.</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Entry point to a the PEI Core</Abstract>\r
     <Description>The library contains the entry point to a PEI core Module Type.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -25,9 +25,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEI_CORE">\r
       <Keyword>PeiCoreEntryPoint</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEI_CORE">\r
       <Keyword>PeiCoreEntryPoint</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PeiCoreEntryPoint.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PeiCoreEntryPoint.c</Filename>\r

diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
index 3385c59e001a817a343a41130b7b8425c82b979e..c58ecb363c496daa3c3f1eeb6fb2109fd31d0346 100644 (file)
--- a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Report status code library</Abstract>\r
     <Description>ReportStatusCodeLib for PEIM which depends upon Pei Services table</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Report status code library</Abstract>\r
     <Description>ReportStatusCodeLib for PEIM which depends upon Pei Services table</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -51,9 +51,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
     </GuidCNames>\r

-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeDataTypeAssertGuid</GuidCName>\r
-    </GuidCNames>\r

     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa b/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
index 23618ee52c3c4776688af778b98c267d77f9acd3..4e4c064559ca117ee8d6a706fbbdc60b3de15edf 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
+++ b/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for IPF KR1 Pei Services Table Pointer Library</Abstract>\r
     <Description>PEI Services Table Library implementation that retrieves a pointer to the PEI
       Services Table from the KR1 register on IPF.</Description>\r
     <Abstract>Component description file for IPF KR1 Pei Services Table Pointer Library</Abstract>\r
     <Description>PEI Services Table Library implementation that retrieves a pointer to the PEI
       Services Table from the KR1 register on IPF.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -26,9 +26,6 @@
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">\r
       <Keyword>PeiServicesTablePointerLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="PEIM PEI_CORE">\r
       <Keyword>PeiServicesTablePointerLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
index 2655293af180493ad612f9abcfbaf9803886787e..d6126f74e77eacc97815541f357b57d133c492ac 100644 (file)
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
@@ -32,13 +32,13 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>IoLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>IoLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r

       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
       <Keyword>PcdLib</Keyword>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r


@@ -55,7 +55,7 @@
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">\r
+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r

       <C_Name>PcdFSBClock</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This value is FSB Clock frequency. Its unit is Hz and its default value is 200000000, that means FSB frequency is 200Mhz.</HelpText>\r
       <C_Name>PcdFSBClock</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This value is FSB Clock frequency. Its unit is Hz and its default value is 200000000, that means FSB frequency is 200Mhz.</HelpText>\r

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
index 26596151d5ef7dab094970c558257c34be42a793..b27460d8ccfcab81496b8a3b69e6b5849d3d7ad1 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <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
     <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


@@ -48,7 +48,7 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
index da29ef5c7bb29c8aa462cb9587adb7311a3a718d..49b341184e6e4e4bcc864d748fecbc3d3ab4ef04 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for Uefi Device Path Library via protocol</Abstract>\r
     <Description>Device Path Library that layers on top of the UEFI 2.0 Device Path Protocol.
       This library is not available for EFI 1.10 modules.</Description>\r
     <Abstract>Component description file for Uefi Device Path Library via protocol</Abstract>\r
     <Description>Device Path Library that layers on top of the UEFI 2.0 Device Path Protocol.
       This library is not available for EFI 1.10 modules.</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <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
     <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


@@ -52,6 +52,9 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDevicePathUtilitiesProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDevicePathUtilitiesProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="SOMETIMES_CONSUMED">\r
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Protocols>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
index 60e07b093fed349fa42473b3a46d771880b05d2e..ce639768379a7e0522b2019d2bc6cbee7c3d7307 100644 (file)
--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
+++ b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Entry point library to a EFI/DXE driver</Description>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Entry point library to a EFI/DXE driver</Description>\r

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r

     <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
     <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


@@ -28,15 +28,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r

     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiBootServicesTableLib</Keyword>\r
     </LibraryClass>\r

-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
-    </LibraryClass>\r

   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DriverEntryPoint.c</Filename>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>DriverEntryPoint.c</Filename>\r