BaseTools/Capsule: Do not support -o with --dump-info

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / PiSmmCpuDxeSmm.inf

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index 31cb215342cac1ccc9f127334bce36339fa902c1..a7fb7b0b148287e3943212ca51654f7ad8f31e74 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
@@ -53,42 +53,22 @@
   Ia32/SmmFuncsArch.c\r
   Ia32/SmmProfileArch.c\r
   Ia32/SmmProfileArch.h\r
-  Ia32/SmmInit.asm\r
-  Ia32/SmiEntry.asm\r
-  Ia32/SmiException.asm\r
-  Ia32/MpFuncs.asm\r
-\r
   Ia32/SmmInit.nasm\r
   Ia32/SmiEntry.nasm\r
   Ia32/SmiException.nasm\r
   Ia32/MpFuncs.nasm\r
 \r
-  Ia32/SmmInit.S\r
-  Ia32/SmiEntry.S\r
-  Ia32/SmiException.S\r
-  Ia32/MpFuncs.S\r
-\r
 [Sources.X64]\r
   X64/Semaphore.c\r
   X64/PageTbl.c\r
   X64/SmmFuncsArch.c\r
   X64/SmmProfileArch.c\r
   X64/SmmProfileArch.h\r
-  X64/SmmInit.asm\r
-  X64/SmiEntry.asm\r
-  X64/SmiException.asm\r
-  X64/MpFuncs.asm\r
-\r
   X64/SmmInit.nasm\r
   X64/SmiEntry.nasm\r
   X64/SmiException.nasm\r
   X64/MpFuncs.nasm\r
 \r
-  X64/SmmInit.S\r
-  X64/SmiEntry.S\r
-  X64/SmiException.S\r
-  X64/MpFuncs.S\r
-\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
@@ -129,6 +109,7 @@
   gEfiSmmCpuProtocolGuid                   ## PRODUCES\r
   gEfiSmmReadyToLockProtocolGuid           ## NOTIFY\r
   gEfiSmmCpuServiceProtocolGuid            ## PRODUCES\r
+  gEdkiiSmmMemoryAttributeProtocolGuid     ## PRODUCES\r
 \r
 [Guids]\r
   gEfiAcpiVariableGuid                     ## SOMETIMES_CONSUMES ## HOB # it is used for S3 boot.\r
@@ -136,6 +117,7 @@
   gEfiAcpi20TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiAcpi10TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable\r
   gEdkiiPiSmmMemoryAttributesTableGuid     ## CONSUMES ## SystemTable\r
+  gEfiMemoryAttributesTableGuid            ## CONSUMES ## SystemTable\r
 \r
 [FeaturePcd]\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug                         ## CONSUMES\r
@@ -160,6 +142,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable                   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask    ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask               ## CONSUMES\r
 \r
 [Depex]\r
   gEfiMpServiceProtocolGuid\r