X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UefiCpuPkg%2FCpuDxe%2FCpuDxe.inf;h=6a199b72f7387ce2331b84aea4d615b383b9378a;hp=b43506ef58667b7c969a1d84c49e4ec245d7d7c4;hb=2a1408d1d739ead00c96397549be7a9fc53c9c6e;hpb=661cab5d6a45308dcb7fb37c646e32efc1a087c4

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index b43506ef58..6a199b72f7 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,8 +1,9 @@
 ## @file
+#  CPU driver installs CPU Architecture Protocol and CPU MP protocol.
 #
-#    Component description file for simple CPU driver
+#  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
 #
-#  Copyright (c) 2008 - 2012, 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
@@ -16,10 +17,10 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CpuDxe
+  MODULE_UNI_FILE                = CpuDxe.uni
   FILE_GUID                      = 1A1E4886-9517-440e-9FDE-3BE44CEE2136
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-
   ENTRY_POINT                    = InitializeCpu
 
 [Packages]
@@ -39,32 +40,50 @@
   UefiDriverEntryPoint
   LocalApicLib
   UefiCpuLib
+  UefiLib
+  CpuExceptionHandlerLib
+  HobLib
+  ReportStatusCodeLib
+  MpInitLib
+  TimerLib
 
 [Sources]
   CpuDxe.c
   CpuDxe.h
   CpuGdt.c
-
-  Ia32/IvtAsm.asm | MSFT
-  Ia32/IvtAsm.asm | INTEL
-  Ia32/IvtAsm.S   | GCC
+  CpuGdt.h
+  CpuMp.c
+  CpuMp.h
+  CpuPageTable.h
+  CpuPageTable.c
 
 [Sources.IA32]
-  Ia32/CpuAsm.asm | MSFT
-  Ia32/CpuAsm.asm | INTEL
-  Ia32/CpuAsm.S   | GCC
+  Ia32/CpuAsm.nasm
 
 [Sources.X64]
-  X64/CpuAsm.asm | MSFT
-  X64/CpuAsm.asm | INTEL
-  X64/CpuAsm.S   | GCC
+  X64/CpuAsm.nasm
 
 [Protocols]
-  gEfiCpuArchProtocolGuid
+  gEfiCpuArchProtocolGuid                       ## PRODUCES
+  gEfiMpServiceProtocolGuid                     ## PRODUCES
+  gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES
 
 [Guids]
-  gIdleLoopEventGuid                            ## CONSUMES ## GUID
+  gIdleLoopEventGuid                            ## CONSUMES           ## Event
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_CONSUMES ## SystemTable
+
+[Ppis]
+  gEfiSecPlatformInformation2PpiGuid            ## UNDEFINED # HOB
+  gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB
+
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard                       ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList              ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize                    ## CONSUMES
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuDxeExtra.uni