X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=UefiCpuPkg%2FCpuDxe%2FCpuDxe.inf;h=57381dbc8588d1e52c1f679a9617f7d15380f303;hb=0acd869796ded1266e69487dff717cd69d6031f9;hp=caf33da75d12682230594c4ca811944ddac02a0d;hpb=712389b8482a4c90c7f83d1c3ddc5865c86793fc;p=mirror_edk2.git

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index caf33da75d..57381dbc85 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,29 +1,25 @@
 ## @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 - 2010, 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.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
 [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]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
 
 [LibraryClasses]
@@ -36,29 +32,55 @@
   MtrrLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
+  LocalApicLib
+  UefiCpuLib
+  UefiLib
+  CpuExceptionHandlerLib
+  HobLib
+  ReportStatusCodeLib
+  MpInitLib
+  TimerLib
+  PeCoffGetEntryPointLib
 
 [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           ## Event
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_CONSUMES ## SystemTable
+
+[Ppis]
+  gEfiSecPlatformInformation2PpiGuid            ## UNDEFINED # HOB
+  gEfiSecPlatformInformationPpiGuid             ## UNDEFINED # HOB
+
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard                       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask    ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList              ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize                    ## CONSUMES
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuDxeExtra.uni