1. removed BaseTimerLibLocalApic from MdePkg and Nt32TimerLib from EdkNt32Pkg.

2. added BaseTimerlibNullTemplate in MdePkg and SecPeiDxeTimerLibCpu in MdePkg. 
3. modified the related spd and fpd files

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

11 files changed, 83 insertions, 284 deletions

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 4e1e99ef10..a95774d35f 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -6,7 +6,7 @@
     <Version>0.3</Version>

     <Abstract>EFI/Framework Reference Module Package for All Architectures</Abstract>

     <Description>This FPD file is used for Package Level build.</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
@@ -814,8 +814,9 @@
         <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: SecPeiDxeTimerLibCpu Path: MdePkg\Library\SecPeiDxeTimerLibCpu\SecPeiDxeTimerLibCpu.msa-->

+        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -5347,10 +5348,13 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="E4541241-8897-411a-91F8-7D7E45837146" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="54D2878F-25CD-4a2b-8420-EBD18E609C76" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FEATURE_FLAG">

@@ -5497,14 +5501,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0x06</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -5523,11 +5519,14 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="E4541241-8897-411a-91F8-7D7E45837146" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="54D2878F-25CD-4a2b-8420-EBD18E609C76" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FEATURE_FLAG">

@@ -5674,22 +5673,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0x06</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT64</DatumType>

-          <MaxDatumSize>8</MaxDatumSize>

-          <Value>0x0ffffc000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -5708,11 +5691,14 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="E4541241-8897-411a-91F8-7D7E45837146" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="54D2878F-25CD-4a2b-8420-EBD18E609C76" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="61999c3c-72a5-4506-a4ff-4271d18a1d14" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FEATURE_FLAG">

@@ -5859,14 +5845,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0x06</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -6658,8 +6636,9 @@
         <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: SecPeiDxeTimerLibCpu Path: MdePkg\Library\SecPeiDxeTimerLibCpu\SecPeiDxeTimerLibCpu.msa-->

+        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -11121,8 +11100,9 @@
         <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: SecPeiDxeTimerLibCpu Path: MdePkg\Library\SecPeiDxeTimerLibCpu\SecPeiDxeTimerLibCpu.msa-->

+        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -15400,8 +15380,9 @@
         <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="be490364-73d2-420d-950e-f6450ca75dfb" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -15476,14 +15457,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -18666,14 +18639,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT64</DatumType>

-          <MaxDatumSize>8</MaxDatumSize>

-          <Value>0x0ffffc000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -18805,14 +18770,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT64</DatumType>

-          <MaxDatumSize>8</MaxDatumSize>

-          <Value>0x0ffffc000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 3dd38f8506..4c7837a14d 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -106,7 +106,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Dxe/WinNtThunk/Cpu/Cpu.msa</Filename>

     <Filename>Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa</Filename>

     <Filename>Library/DxeWinNtLib/DxeWinNtLib.msa</Filename>

-    <Filename>Library/Nt32TimerLibNull/Nt32TimerLib.msa</Filename>

     <Filename>Library/EdkGenericBdsLib/EdkGenericBdsLib.msa</Filename>

     <Filename>Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa</Filename>

     <Filename>Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa</Filename>

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 5c81986e85..df63b7538d 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7,7 +7,7 @@
     <Abstract>EFI/Framework Emulation Platform</Abstract>

     <Description>The Emulation Platform can be used to debug individual modules, prior to creating
       a real platform. This also provides an example for how an FPD is created.</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
@@ -235,8 +235,8 @@
         <Instance ModuleGuid="FC120ED3-40E1-46dc-8C9C-AAE3CA139ACF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b2585b69-fb63-4220-844a-8fbea8bf01af" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <!--Pkg: EdkNt32Pkg Mod: Nt32TimerLib Path: EdkNt32Pkg\Library\Nt32TimerLibNull\Nt32TimerLib.msa-->

-        <Instance ModuleGuid="3813bb9b-808b-4dcb-b9a3-ea47bd9324c0" ModuleVersion="1.0" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -586,14 +586,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>200000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT64</DatumType>

-          <MaxDatumSize>8</MaxDatumSize>

-          <Value>0x0ffffc000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

@@ -1651,6 +1643,8 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -2424,13 +2418,18 @@
         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="926c9cd0-4bb8-479b-9ac4-8a2a23f85307" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="E4541241-8897-411a-91F8-7D7E45837146" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="F3E4E221-D5CA-4dc9-8CB2-C5123C4827D5" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

         <Instance ModuleGuid="1c747f6b-0a58-49ae-8ea3-0327a4fa10e3" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

         <Instance ModuleGuid="a804239b-4155-446f-acc8-f0825d74908c" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: EdkNt32Pkg Mod: DxeWinNtLib Path: EdkNt32Pkg\Library\DxeWinNtLib\DxeWinNtLib.msa-->

+        <Instance ModuleGuid="f6b5871d-5226-41b3-a569-3ff893fdc7bc" ModuleVersion="1.0" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseTimerLibNullTemplate Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+        <Instance ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FEATURE_FLAG">

@@ -2585,22 +2584,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>FALSE</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdIoBlockBaseAddressForIpf</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT64</DatumType>

-          <MaxDatumSize>8</MaxDatumSize>

-          <Value>0x0ffffc000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

@@ -3777,6 +3760,8 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: UefiRuntimeServicesTableLib Path: MdePkg\Library\UefiRuntimeServicesTableLib\UefiRuntimeServicesTableLib.msa-->

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -7319,8 +7304,6 @@
         <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

         <!--Pkg: MdePkg Mod: BasePcdLibNull Path: MdePkg\Library\BasePcdLibNull\BasePcdLibNull.msa-->

         <Instance ModuleGuid="40096a3a-5c2a-4fbc-aef7-5475dd7ab334" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

-        <!--Pkg: EdkNt32Pkg Mod: Nt32TimerLib Path: EdkNt32Pkg\Library\Nt32TimerLibNull\Nt32TimerLib.msa-->

-        <Instance ModuleGuid="3813bb9b-808b-4dcb-b9a3-ea47bd9324c0" ModuleVersion="1.0" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" PackageVersion="0.3"/>

         <!--Pkg: MdePkg Mod: BasePrintLib Path: MdePkg\Library\BasePrintLib\BasePrintLib.msa-->

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

         <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->

@@ -7925,20 +7908,20 @@
       @REM are licensed and made available under the terms and conditions of the BSD License

       @REM which accompanies this distribution.  The full text of the license may be found at

       @REM http://opensource.org/licenses/bsd-license.php

-      @REM 

+      @REM

       @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

       @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-      @REM 

-      

-      @echo off 

-      pushd . 

+      @REM

+

+      @echo off

+      pushd .

       cd ${SecMainPath}

       SecMain.exe

       popd

       @echo on</echo>

   </UserExtensions>

   <UserExtensions UserID="TianoCore" Identifier="run">

-    <!-- execute the NT32 simulator -->

+    <!--execute the NT32 simulator-->

     <exec executable="${TARGET_DIR}/IA32/SecMain.exe" dir="${TARGET_DIR}/IA32" spawn="false"/>

   </UserExtensions>

 </PlatformSurfaceArea>
\ No newline at end of file
diff --git a/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c b/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c
deleted file mode 100644
index 416a44f4ea..0000000000
--- a/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/** @file

-  Timer Library functions for EBC.

-

-  Copyright (c) 2006, Intel Corporation<BR>

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

-

-  Module Name:  EbcTimerLib.c

-

-**/

-

-/**

-  Stalls the CPU for at least the given number of microseconds.

-

-  Stalls the CPU for the number of microseconds specified by MicroSeconds.

-

-  @param  MicroSeconds  The minimum number of microseconds to delay.

-

-  @return MicroSeconds

-

-**/

-UINTN

-EFIAPI

-MicroSecondDelay (

-  IN      UINTN                     MicroSeconds

-  )

-{

-  //

-  // EBC architecture does not support local APIC timer.

-  //

-  ASSERT (FALSE);

-  return MicroSeconds;

-}

-

-/**

-  Stalls the CPU for at least the given number of nanoseconds.

-

-  Stalls the CPU for the number of nanoseconds specified by NanoSeconds.

-

-  @param  NanoSeconds The minimum number of nanoseconds to delay.

-

-  @return NanoSeconds

-

-**/

-UINTN

-EFIAPI

-NanoSecondDelay (

-  IN      UINTN                     NanoSeconds

-  )

-{

-  //

-  // EBC architecture does not support local APIC timer.

-  //

-  ASSERT (FALSE);

-  return NanoSeconds;

-}

-

-/**

-  Retrieves the current value of a 64-bit free running performance counter.

-

-  Retrieves the current value of a 64-bit free running performance counter. The

-  counter can either count up by 1 or count down by 1. If the physical

-  performance counter counts by a larger increment, then the counter values

-  must be translated. The properties of the counter can be retrieved from

-  GetPerformanceCounterProperties().

-

-  @return The current value of the free running performance counter.

-

-**/

-UINT64

-EFIAPI

-GetPerformanceCounter (

-  VOID

-  )

-{

-  //

-  // EBC architecture does not support local APIC timer.

-  //

-  ASSERT (FALSE);

-  return 0;

-}

-

-/**

-  Retrieves the 64-bit frequency in Hz and the range of performance counter

-  values.

-

-  If StartValue is not NULL, then the value that the performance counter starts

-  with immediately after is it rolls over is returned in StartValue. If

-  EndValue is not NULL, then the value that the performance counter end with

-  immediately before it rolls over is returned in EndValue. The 64-bit

-  frequency of the performance counter in Hz is always returned. If StartValue

-  is less than EndValue, then the performance counter counts up. If StartValue

-  is greater than EndValue, then the performance counter counts down. For

-  example, a 64-bit free running counter that counts up would have a StartValue

-  of 0 and an EndValue of 0xFFFFFFFFFFFFFFFF. A 24-bit free running counter

-  that counts down would have a StartValue of 0xFFFFFF and an EndValue of 0.

-

-  @param  StartValue  The value the performance counter starts with when it

-                      rolls over.

-  @param  EndValue    The value that the performance counter ends with before

-                      it rolls over.

-

-  @return The frequency in Hz.

-

-**/

-UINT64

-EFIAPI

-GetPerformanceCounterProperties (

-  OUT      UINT64                    *StartValue,  OPTIONAL

-  OUT      UINT64                    *EndValue     OPTIONAL

-  )

-{

-  //

-  // EBC architecture does not support local APIC timer.

-  //

-  ASSERT (FALSE);

-  return 0;

-}

diff --git a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
index 00898585e4..65ea51dfcf 100644
--- a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
@@ -1,44 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

-    <ModuleName>Nt32TimerLib</ModuleName>

+    <ModuleName>BaseTimerLibNullTemplate</ModuleName>

     <ModuleType>BASE</ModuleType>

-    <GuidValue>3813bb9b-808b-4dcb-b9a3-ea47bd9324c0</GuidValue>

+    <GuidValue>f4731d79-537e-4505-bd52-c03f9b1f6b89</GuidValue>

     <Version>1.0</Version>

-    <Abstract>Component description file for Nt32Timer Library</Abstract>

-    <Description>Timer Library provide API of TimerLib library class for Nt32 platform,

-      Now this library do not impletement functionality completely.</Description>

-    <Copyright>Copyright (c) 2006, 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

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <Abstract>Timer library NULL template implementaton</Abstract>

+    <Description>This NULL Timer library provides one template API of TimerLib library,
+      this library do not impletement functionality completely.</Description>

+    <Copyright>Copyright (c) 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
+      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.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32</SupportedArchitectures>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>Nt32TimerLib</OutputFileBasename>

+    <OutputFileBasename>BaseTimerLibNullTemplate</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_PRODUCED">

       <Keyword>TimerLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

-    <Filename SupArchList="IA32">Nt32TimerLib.c</Filename>

+    <Filename>TimerLibNull.c</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
index 40a1a41eb8..33a9736a24 100644
--- a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
@@ -1,9 +1,7 @@
 /** @file

-  Timer Library functions for Nt32 platform.

+  Timer Library functions for runtime drivers.

 

-  @bug Still no complete implementation for time library function for Nt32 platform.

-

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2007, Intel Corporation<BR>

   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

@@ -12,7 +10,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-  Module Name:  x86TimerLib.c

+  Module Name:  RuntimeTimerLib.c

 

 **/

 

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index 65b58bc549..9049fef997 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
@@ -1,11 +1,7 @@
 /** @file

-  Timer Library functions built upon local APIC on IA32/x64.

+  Timer Library functions built upon ITC on IA32/x64.

 

-  @bug Should use PCD to retrieve all the constants including index of

-  the IA32_APIC_BASE MSR, the offsets of InitialCount, CorrentCount

-  and DivideConfiguration.

-

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   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

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
index 539021dd93..4c152caae6 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

-    <ModuleName>BaseTimerLibLocalApic</ModuleName>

+    <ModuleName>SecPeiDxeTimerLibCpu</ModuleName>

     <ModuleType>BASE</ModuleType>

     <GuidValue>b5a05743-9b71-489b-a0ed-a0eb3950d23b</GuidValue>

     <Version>1.0</Version>

-    <Abstract>Component description file for Baser Timer Library</Abstract>

-    <Description>Timer Library that only uses CPU resources to provide calibrated
-      delays on IA-32 and x64. Note: Because CpuLocalApci timer could be programmed
-      by OS, it cannot be used by SMM drivers and runtime drivers, ACPI timer is
-      recommended for SMM drivers and runtime drivers.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>

+    <Abstract>Timer Library implementation for boot time drivers.</Abstract>

+    <Description>Timer Library that uses CPU resources to provide calibrated
+      delays on IA-32 and x64, and uses ITC on IPF. Note: Because CpuLocalApci
+      and ITC could be programmed by OS, it cannot be used by SMM drivers
+      and runtime drivers, ACPI timer is recommended for SMM drivers and RUNTIME
+      drivers.</Description>

+    <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
@@ -20,12 +21,12 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>BaseTimerLibLocalApic</OutputFileBasename>

+    <OutputFileBasename>SecPeiDxeTimerLibCpu</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_PRODUCED">

+    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="BASE DXE_CORE DXE_DRIVER DXE_SAL_DRIVER PEIM PEI_CORE SEC UEFI_APPLICATION UEFI_DRIVER">

       <Keyword>TimerLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -44,8 +45,7 @@
   <SourceFiles>

     <Filename SupArchList="IA32">x86TimerLib.c</Filename>

     <Filename SupArchList="X64">x86TimerLib.c</Filename>

-    <Filename SupArchList="IPF">Ipf/IpfTimerLib.c</Filename>

-    <Filename SupArchList="EBC">Ebc/EbcTimerLib.c</Filename>

+    <Filename SupArchList="IPF">IpfTimerLib.c</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

diff --git a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
index 235fe7be6d..7467bc5e4d 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
@@ -5,7 +5,7 @@
   the IA32_APIC_BASE MSR, the offsets of InitialCount, CorrentCount

   and DivideConfiguration.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   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

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 76c6630c1c..cf1083955b 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -1779,22 +1779,6 @@
         <FfsFormatKey>LIBRARY</FfsFormatKey>

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

-      </ModuleSaBuildOptions>

-    </ModuleSA>

     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="556f5d10-7309-4af4-b80a-8196bd60946f">

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -2284,6 +2268,14 @@
     <ModuleSA ModuleGuid="DADE8301-CB29-4fd5-8148-56FD246C5B88" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="IPF"/>

     <!--Mod: UefiApplicationEntryPoint Type: UEFI_DRIVER Path: MdePkg\Library\UefiApplicationEntryPoint\UefiApplicationEntryPoint.msa-->

     <ModuleSA ModuleGuid="DADE8301-CB29-4fd5-8148-56FD246C5B88" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="EBC"/>

+    <!--Mod: BaseTimerLibNullTemplate Type: BASE Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+    <ModuleSA ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="IA32"/>

+    <!--Mod: BaseTimerLibNullTemplate Type: BASE Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+    <ModuleSA ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="X64"/>

+    <!--Mod: BaseTimerLibNullTemplate Type: BASE Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+    <ModuleSA ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="IPF"/>

+    <!--Mod: BaseTimerLibNullTemplate Type: BASE Path: MdePkg\Library\BaseTimerLibNullTemplate\BaseTimerLibNullTemplate.msa-->

+    <ModuleSA ModuleGuid="f4731d79-537e-4505-bd52-c03f9b1f6b89" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3" SupArchList="EBC"/>

   </FrameworkModules>

   <BuildOptions>

     <Ffs FfsKey="APPLICATION">

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 6bfbdb3b2d..a70622b1b4 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1150,7 +1150,6 @@
     <Filename>Library/BasePciExpressLib/BasePciExpressLib.msa</Filename>

     <Filename>Library/BasePciLibCf8/BasePciLibCf8.msa</Filename>

     <Filename>Library/BasePciLibPciExpress/BasePciLibPciExpress.msa</Filename>

-    <Filename>Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa</Filename>

     <Filename>Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa</Filename>

     <Filename>Library/DxeCoreHobLib/DxeCoreHobLib.msa</Filename>

     <Filename>Library/DxeHobLib/DxeHobLib.msa</Filename>

@@ -1185,6 +1184,8 @@
     <Filename>Library/DxeMemoryLib/DxeMemoryLib.msa</Filename>

     <Filename>Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa</Filename>

     <Filename>Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa</Filename>

+    <Filename>Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa</Filename>

+    <Filename>Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa</Filename>

   </MsaFiles>

   <PackageHeaders>

     <IncludePkgHeader ModuleType="BASE">Include/Base.h</IncludePkgHeader>