added PcdPlatformBusSpeed for BaseTimerLibLocalApic, thus this timer instance needn...

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index a2da834923646b120c089a8eaf237190570ccbbf..6a7d0bb46e4eb0bb1e7471d2fc5f741c13d1f1d1 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -858,6 +858,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -4863,6 +4871,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -5032,6 +5048,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -5201,6 +5225,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x06</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -6036,6 +6068,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -10075,6 +10115,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r
@@ -14118,6 +14166,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>NULL</FvBinding>\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 42e33a691f582d515fc3ac976e450c29b8b80c1f..0d95efdd2db02d54679efaedaae1f9042f29d0f3 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -578,6 +578,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>TRUE</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
@@ -2529,6 +2537,14 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>FALSE</Value>\r
         </PcdData>\r
+        <PcdData ItemType="FIXED_AT_BUILD">\r
+          <C_Name>PcdPlatformBusSpeed</C_Name>\r
+          <Token>0x0000000c</Token>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+          <DatumType>UINT32</DatumType>\r
+          <MaxDatumSize>4</MaxDatumSize>\r
+          <Value>200000000</Value>\r
+        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
index f24d6daabed29ebcf36ab1abc809dd1ee555fde4..f1d22f260333d5e3e2649aaf26393f3a1317bd08 100644 (file)
--- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
+++ b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
@@ -35,6 +35,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PcdLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename SupArchList="IA32">x86TimerLib.c</Filename>\r
@@ -49,4 +52,11 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">\r
+      <C_Name>PcdPlatformBusSpeed</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>This value is the Bus Speed on platform</HelpText>\r
+    </PcdEntry>\r
+  </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c b/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
index 87c33a7c5ddc030f5a91c9196e7615aa206761d6..d2935cf83a19700da695cac5a27a094d42c3ba0a 100644 (file)
--- a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
+++ b/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
@@ -19,18 +19,9 @@
 **/\r
 \r
 //\r
-// The following 2 arrays are used in calculating the frequency of local APIC\r
+// The following array is used in calculating the frequency of local APIC\r
 // timer. Refer to IA-32 developers' manual for more details.\r
 //\r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED\r
-CONST UINT32                          mTimerLibLocalApicFrequencies[] = {\r
-  100000000,\r
-  133000000,\r
-  200000000,\r
-  166000000\r
-};\r
-\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 CONST UINT8                           mTimerLibLocalApicDivisor[] = {\r
   0x02, 0x04, 0x08, 0x10,\r
@@ -73,7 +64,7 @@ InternalX86GetTimerFrequency (
   )\r
 {\r
   return\r
-    mTimerLibLocalApicFrequencies[AsmMsrBitFieldRead32 (44, 16, 18)] /\r
+    PcdGet32(PcdPlatformBusSpeed) /\r
     mTimerLibLocalApicDivisor[MmioBitFieldRead32 (ApicBase + 0x3e0, 0, 3)];\r
 }\r
 \r
@@ -255,5 +246,5 @@ GetPerformanceCounterProperties (
     *EndValue = 0;\r
   }\r
 \r
-  return (UINT64)InternalX86GetTimerFrequency (ApicBase);\r
+  return PcdGet32(PcdPlatformBusSpeed);\r
 }\r

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index e0213a5d8715a18c770558e69dfe7befdc1ce6e1..e4a3fa3f12136d7fc5505fbfaa6f59edde99fc96 100644 (file)
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <PlatformHeader>
     <PlatformName>MdePkgAll</PlatformName>
     <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>
@@ -31,6 +21,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <BuildTargets>DEBUG RELEASE</BuildTargets>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>
     <OutputDirectory>Build/Mde</OutputDirectory>
+    <SkuInfo>
+      <UiSkuName SkuID="0">DEFAULT</UiSkuName>
+    </SkuInfo>
   </PlatformDefinitions>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
@@ -113,6 +106,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPlatformBusSpeed</C_Name>
+          <Token>0x0000000c</Token>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>200000000</Value>
+        </PcdData>
+      </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -661,6 +664,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPlatformBusSpeed</C_Name>
+          <Token>0x0000000c</Token>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>200000000</Value>
+        </PcdData>
+      </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1221,6 +1234,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPlatformBusSpeed</C_Name>
+          <Token>0x0000000c</Token>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>200000000</Value>
+        </PcdData>
+      </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -1769,6 +1792,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </ModuleSaBuildOptions>
     </ModuleSA>
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
+      <PcdBuildDefinition>
+        <PcdData ItemType="FIXED_AT_BUILD">
+          <C_Name>PcdPlatformBusSpeed</C_Name>
+          <Token>0x0000000c</Token>
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
+          <DatumType>UINT32</DatumType>
+          <MaxDatumSize>4</MaxDatumSize>
+          <Value>200000000</Value>
+        </PcdData>
+      </PcdBuildDefinition>
       <ModuleSaBuildOptions>
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>LIBRARY</FfsFormatKey>
@@ -2254,153 +2287,135 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </ModuleSA>
   </FrameworkModules>
   <BuildOptions>
-         <Ffs FfsKey="APPLICATION">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_PE32" /> 
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-               <Section SectionType="EFI_SECTION_VERSION" /> 
-             </Sections>
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="BINARY">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections  EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_RAW" /> 
-             </Sections>
-           </Sections>
-         </Ffs>
-         
-         <Ffs FfsKey="FILE">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections>
-             <Section SectionType="EFI_SECTION_RAW"/> 
-           </Sections>
-         </Ffs>
-         
-         <Ffs FfsKey="PE32_PEIM_CompressPEIM">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" /> 
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
-       
-           <Sections>
-             <Section SectionType="EFI_SECTION_PEI_DEPEX" />
-             <Sections EncapsulationType="Compress">
-               <Section SectionType="EFI_SECTION_PE32" /> 
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-               <Section SectionType="EFI_SECTION_VERSION" /> 
-             </Sections>
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="PEI_CORE">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections>
-             <Section SectionType="EFI_SECTION_PE32"/>
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
-             <Section SectionType="EFI_SECTION_VERSION"/>
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="PE32_PEIM_Relocatable">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections>
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
-             <Section SectionType="EFI_SECTION_PE32"/> 
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="DXE_CORE">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections EncapsulationType="Compress">
-             <Section SectionType="EFI_SECTION_PE32" /> 
-             <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-             <Section SectionType="EFI_SECTION_VERSION" /> 
-           </Sections>
-         </Ffs>
-       
-       
-         <Ffs FfsKey="BS_DRIVER">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> 
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
-       
-           <Sections EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />
-               <Section SectionType="EFI_SECTION_PE32" />
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-               <Section SectionType="EFI_SECTION_VERSION" />
-             </Sections>
-           </Sections>
-         </Ffs>
-         
-         <Ffs FfsKey="RT_DRIVER">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> 
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
-       
-           <Sections EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />
-               <Section SectionType="EFI_SECTION_PE32" />
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-               <Section SectionType="EFI_SECTION_VERSION" />
-             </Sections>
-           </Sections>
-         </Ffs>
-         
-         <Ffs FfsKey="SAL_RT_DRIVER">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> 
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
-       
-           <Sections EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_PEI_DEPEX" />
-               <Section SectionType="EFI_SECTION_PE32" />
-               <Section SectionType="EFI_SECTION_USER_INTERFACE" />
-               <Section SectionType="EFI_SECTION_VERSION" />
-             </Sections>
-           </Sections>
-         </Ffs>
-               
-         <Ffs FfsKey="COMBINED_PEIM_DRIVER">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections>
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
-             <Section SectionType="EFI_SECTION_PE32"/> 
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
-             <Section SectionType="EFI_SECTION_VERSION"/> 
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="PE32_PEIM">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections>
-             <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
-             <Section SectionType="EFI_SECTION_PE32"/> 
-             <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
-             <Section SectionType="EFI_SECTION_VERSION"/> 
-           </Sections>
-         </Ffs>
-       
-         <Ffs FfsKey="Logo">
-           <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
-           <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
-           <Sections EncapsulationType="Compress">
-             <Sections EncapsulationType="Guid-Defined">
-               <Section SectionType="EFI_SECTION_RAW" /> 
-             </Sections>
-           </Sections>
-         </Ffs>
-         
+    <Ffs FfsKey="APPLICATION">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_PE32"/>
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+          <Section SectionType="EFI_SECTION_VERSION"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="BINARY">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_RAW"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="FILE">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_RAW"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="PE32_PEIM_CompressPEIM">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+        <Sections EncapsulationType="Compress">
+          <Section SectionType="EFI_SECTION_PE32"/>
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+          <Section SectionType="EFI_SECTION_VERSION"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="PEI_CORE">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_PE32"/>
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+        <Section SectionType="EFI_SECTION_VERSION"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="PE32_PEIM_Relocatable">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+        <Section SectionType="EFI_SECTION_PE32"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="DXE_CORE">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Section SectionType="EFI_SECTION_PE32"/>
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+        <Section SectionType="EFI_SECTION_VERSION"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="BS_DRIVER">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+          <Section SectionType="EFI_SECTION_PE32"/>
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+          <Section SectionType="EFI_SECTION_VERSION"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="RT_DRIVER">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+          <Section SectionType="EFI_SECTION_PE32"/>
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+          <Section SectionType="EFI_SECTION_VERSION"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="SAL_RT_DRIVER">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+          <Section SectionType="EFI_SECTION_PE32"/>
+          <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+          <Section SectionType="EFI_SECTION_VERSION"/>
+        </Sections>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="COMBINED_PEIM_DRIVER">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+        <Section SectionType="EFI_SECTION_PE32"/>
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+        <Section SectionType="EFI_SECTION_VERSION"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="PE32_PEIM">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections>
+        <Section SectionType="EFI_SECTION_PEI_DEPEX"/>
+        <Section SectionType="EFI_SECTION_PE32"/>
+        <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+        <Section SectionType="EFI_SECTION_VERSION"/>
+      </Sections>
+    </Ffs>
+    <Ffs FfsKey="Logo">
+      <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM"/>
+      <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE"/>
+      <Sections EncapsulationType="Compress">
+        <Sections EncapsulationType="Guid-Defined">
+          <Section SectionType="EFI_SECTION_RAW"/>
+        </Sections>
+      </Sections>
+    </Ffs>
   </BuildOptions>
 </PlatformSurfaceArea>

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index cac04220c92f5099c160ee25c0fa5533fe39eefd..5abbddaa610136cf3e4c60a529afad3dfe43b9d8 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>MdePkg</PackageName>\r
     <GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>\r
@@ -28,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </SpdHeader>\r
   <PackageDefinitions>\r
-    <ReadOnly>true</ReadOnly>\r
+    <ReadOnly>false</ReadOnly>\r
     <RePackage>false</RePackage>\r
   </PackageDefinitions>\r
   <LibraryClassDeclarations>\r
@@ -2334,5 +2324,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DefaultValue>0xE0000000</DefaultValue>\r
       <HelpText>The base address of PCI Express MMIO window.</HelpText>\r
     </PcdEntry>\r
+    <PcdEntry>\r
+      <C_Name>PcdPlatformBusSpeed</C_Name>\r
+      <Token>0x0000000c</Token>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>UINT32</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
+      <DefaultValue>200000000</DefaultValue>\r
+      <HelpText>This value is the Bus Speed on platform</HelpText>\r
+    </PcdEntry>\r
   </PcdDeclarations>\r
 </PackageSurfaceArea>
\ No newline at end of file