X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UefiCpuPkg%2FCpuDxe%2FCpuDxe.inf;h=bdff548cc2728306ee0e9d653287075fa8e4c7cb;hp=11be264efe2025551ff8b76596e801d0a3f59e50;hb=b85a6ffb441129889c301459207a729d562ab8e8;hpb=3e6374dfd85e6189e6f438cfbfbbf92e5fcc5d78

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 11be264efe..bdff548cc2 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,9 +1,8 @@
-#/** @file
+## @file
+#  Simple CPU driver installs CPU Architecture Protocol.
 #
-#    Component description file for simple CPU driver
-#
-#  Copyright (c) 2008 - 2009, Intel Corporation. <BR>
-#  All rights reserved. This program and the accompanying materials
+#  Copyright (c) 2008 - 2016, 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
@@ -11,21 +10,21 @@
 #  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]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CpuDxe
-  FILE_GUID                      = 62D171CB-78CD-4480-8678-C6A2A797A8DE
+  MODULE_UNI_FILE                = CpuDxe.uni
+  FILE_GUID                      = 1A1E4886-9517-440e-9FDE-3BE44CEE2136
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x0002000A
 
   ENTRY_POINT                    = InitializeCpu
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
 
 [LibraryClasses]
@@ -38,29 +37,57 @@
   MtrrLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
+  LocalApicLib
+  UefiCpuLib
+  UefiLib
+  CpuExceptionHandlerLib
+  TimerLib
+  SynchronizationLib
+  HobLib
+  ReportStatusCodeLib
 
 [Sources]
+  ApStartup.c
   CpuDxe.c
   CpuDxe.h
   CpuGdt.c
-
-  Ia32/IvtAsm.asm | MSFT
-  Ia32/IvtAsm.asm | INTEL
-  Ia32/IvtAsm.S   | GCC
+  CpuGdt.h
+  CpuMp.c
+  CpuMp.h
 
 [Sources.IA32]
-  Ia32/CpuAsm.asm | MSFT
-  Ia32/CpuAsm.asm | INTEL
-  Ia32/CpuAsm.S   | GCC
+  Ia32/CpuAsm.asm
+  Ia32/CpuAsm.nasm
+  Ia32/CpuAsm.S
+  Ia32/MpAsm.asm
+  Ia32/MpAsm.nasm
 
 [Sources.X64]
-  X64/CpuAsm.asm | MSFT
-  X64/CpuAsm.asm | INTEL
-  X64/CpuAsm.S   | GCC
+  X64/CpuAsm.asm
+  X64/CpuAsm.nasm
+  X64/CpuAsm.S
+  X64/MpAsm.asm
+  X64/MpAsm.nasm
 
 [Protocols]
-  gEfiCpuArchProtocolGuid
+  gEfiCpuArchProtocolGuid                       ## PRODUCES
+  gEfiMpServiceProtocolGuid                     ## SOMETIMES_PRODUCES
+
+[Guids]
+  gIdleLoopEventGuid                            ## CONSUMES           ## Event
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_CONSUMES ## SystemTable
+
+[Ppis]
+  gEfiSecPlatformInformation2PpiGuid            ## UNDEFINED # HOB
+  gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB
+
+[Pcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber    ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize                  ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds  ## CONSUMES
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuDxeExtra.uni