X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UefiCpuPkg%2FPiSmmCpuDxeSmm%2FPiSmmCpuDxeSmm.inf;h=52d8c550752ba2b5eb595a76fd5fd20cab8b7d00;hb=5a1bfda4bd04815ed8c7489e2db47f9a1f245566;hp=a293a88e9914930ddbe6e2e8cdf3e35469aacd4f;hpb=c2e5e70a854552f91ae29e4b85dfc213dbaaca6d;p=mirror_edk2.git

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index a293a88e99..52d8c55075 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
@@ -4,7 +4,8 @@
 # This SMM driver performs SMM initialization, deploy SMM Entry Vector,
 # provides CPU specific services in SMM.
 #
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -44,46 +45,29 @@
   SmmProfile.h
   SmmProfileInternal.h
   SmramSaveState.c
+  SmmCpuMemoryManagement.c
 
 [Sources.Ia32]
   Ia32/Semaphore.c
   Ia32/PageTbl.c
+  Ia32/SmmFuncsArch.c
   Ia32/SmmProfileArch.c
   Ia32/SmmProfileArch.h
-  Ia32/SmmInit.asm      | MSFT
-  Ia32/SmiEntry.asm     | MSFT
-  Ia32/SmiException.asm | MSFT
-  Ia32/MpFuncs.asm      | MSFT
-
-  Ia32/SmmInit.asm      | INTEL
-  Ia32/SmiEntry.asm     | INTEL
-  Ia32/SmiException.asm | INTEL
-  Ia32/MpFuncs.asm      | INTEL
-
-  Ia32/SmmInit.S        | GCC
-  Ia32/SmiEntry.S       | GCC
-  Ia32/SmiException.S   | GCC
-  Ia32/MpFuncs.S        | GCC
+  Ia32/SmmInit.nasm
+  Ia32/SmiEntry.nasm
+  Ia32/SmiException.nasm
+  Ia32/MpFuncs.nasm
 
 [Sources.X64]
   X64/Semaphore.c
   X64/PageTbl.c
+  X64/SmmFuncsArch.c
   X64/SmmProfileArch.c
   X64/SmmProfileArch.h
-  X64/SmmInit.asm      | MSFT
-  X64/SmiEntry.asm     | MSFT
-  X64/SmiException.asm | MSFT
-  X64/MpFuncs.asm      | MSFT
-
-  X64/SmmInit.asm      | INTEL
-  X64/SmiEntry.asm     | INTEL
-  X64/SmiException.asm | INTEL
-  X64/MpFuncs.asm      | INTEL
-
-  X64/SmmInit.S        | GCC
-  X64/SmiEntry.S       | GCC
-  X64/SmiException.S   | GCC
-  X64/MpFuncs.S        | GCC
+  X64/SmmInit.nasm
+  X64/SmiEntry.nasm
+  X64/SmiException.nasm
+  X64/MpFuncs.nasm
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -125,12 +109,14 @@
   gEfiSmmCpuProtocolGuid                   ## PRODUCES
   gEfiSmmReadyToLockProtocolGuid           ## NOTIFY
   gEfiSmmCpuServiceProtocolGuid            ## PRODUCES
+  gEdkiiSmmMemoryAttributeProtocolGuid     ## PRODUCES
 
 [Guids]
   gEfiAcpiVariableGuid                     ## SOMETIMES_CONSUMES ## HOB # it is used for S3 boot.
   gEfiGlobalVariableGuid                   ## SOMETIMES_PRODUCES ## Variable:L"SmmProfileData"
   gEfiAcpi20TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable
   gEfiAcpi10TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable
+  gEdkiiPiSmmMemoryAttributesTableGuid     ## CONSUMES ## SystemTable
 
 [FeaturePcd]
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug                         ## CONSUMES
@@ -151,6 +137,11 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugDataAddress               ## SOMETIMES_PRODUCES
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable         ## CONSUMES
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode                      ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStaticPageTable               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask               ## CONSUMES
 
 [Depex]
   gEfiMpServiceProtocolGuid