X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FLibrary%2FSecPeiDxeTimerLibCpu%2FSecPeiDxeTimerLibCpu.inf;h=0feb42f0b366b529d414ced52c5aa16a83dc20b8;hp=9fbceafebb10703063d0eab34768d19db1af7b08;hb=9095d37b8fe5bfc3d02adad6ba7fd7359ebc0107;hpb=5ed00ce4ad778ba6aef0d2f4594825ff78735357

diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index 9fbceafebb..0feb42f0b3 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -1,106 +1,67 @@
-#/** @file
-# Timer Library implementation for Boot Timer moudles that require timer services.
+## @file
+# Instance of Timer Library only using CPU resources.
 #
-# 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.
-# Copyright (c) 2007 - 2007, Intel Corporation.
+# Timer Library that only uses CPU resources to provide calibrated delays
+#  on IA-32, x64, and IPF.
+# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can use this TimerLib
+#  in their initialization without any issues. They only have to be careful in
+#  the implementation of runtime services and SMI handlers.
+#  Because CPU Local APIC 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.
 #
-#  All rights reserved. This program and the accompanying materials
+# Note that for IA-32 and x64, this library only supports xAPIC mode. If x2APIC
+# support is desired, the SecPeiDxeTimerLibUefiCpu library can be used.
+#
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+#
+#  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
+#  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.
 #
 #
-#**/
+##
 
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SecPeiDxeTimerLibCpu
+  MODULE_UNI_FILE                = SecPeiDxeTimerLibCpu.uni
   FILE_GUID                      = b5a05743-9b71-489b-a0ed-a0eb3950d23b
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = TimerLib|BASE DXE_CORE DXE_DRIVER DXE_SAL_DRIVER PEIM PEI_CORE SEC UEFI_APPLICATION UEFI_DRIVER 
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
+  LIBRARY_CLASS                  = TimerLib
 
 
-#
-# The following information is for reference only and not required by the build tools.
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF
 #
 
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
-[Sources.common]
-  CommonHeader.h
-
-[Sources.Ia32]
-  x86TimerLib.c
-
-[Sources.X64]
-  x86TimerLib.c
+[Sources.Ia32, Sources.X64]
+  X86TimerLib.c
 
 [Sources.IPF]
   IpfTimerLib.c
 
 
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-#                              this module.
-#
-################################################################################
-
 [Packages]
   MdePkg/MdePkg.dec
 
 
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-#                         this module.
-#
-################################################################################
-
 [LibraryClasses]
   BaseLib
 
-[LibraryClasses.IA32]
-  PcdLib
-  IoLib
-
-[LibraryClasses.X64]
+[LibraryClasses.IA32, LibraryClasses.X64]
   PcdLib
   IoLib
-
-[LibraryClasses.IPF]
   DebugLib
 
+[LibraryClasses.IPF]
+  PalLib
 
-################################################################################
-#
-# Pcd DYNAMIC - list of PCDs that this module is coded for.
-#
-################################################################################
-
-[PcdsDynamic.IA32]
-  PcdFSBClock|gEfiMdePkgTokenSpaceGuid
 
-[PcdsDynamic.X64]
-  PcdFSBClock|gEfiMdePkgTokenSpaceGuid
+[Pcd.IA32, Pcd.X64]
+  gEfiMdePkgTokenSpaceGuid.PcdFSBClock  ## CONSUMES