MdeModulePkg/Core/Dxe: Add EndOfDxe workaround for NULL pointer detection

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain.inf

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index e3e4d036dbea8c2cc8a10963010b3ce87c98ee51..15f4b03d3ceea2c6b26576d9b9c0e5e9893984e8 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -3,7 +3,7 @@
 #\r
 #  It provides an implementation of DXE Core that is compliant with DXE CIS.\r
 #  \r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -42,6 +42,7 @@
   Misc/InstallConfigurationTable.c\r
   Misc/PropertiesTable.c\r
   Misc/MemoryAttributesTable.c\r
+  Misc/MemoryProtection.c\r
   Library/Library.c\r
   Hand/DriverSupport.c\r
   Hand/Notify.c\r
@@ -106,7 +107,7 @@
   ## CONSUMES   ## Event\r
   ## PRODUCES   ## Event\r
   gEfiEventExitBootServicesGuid\r
-  gEfiHobMemoryAllocModuleGuid                  ## CONSUMES             ## HOB\r
+  gEfiHobMemoryAllocModuleGuid                  ## SOMETIMES_CONSUMES   ## HOB\r
   gEfiFirmwareFileSystem2Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format\r
   gEfiFirmwareFileSystem3Guid                   ## CONSUMES             ## GUID # Used to compare with FV's file system guid and get the FV's file system format\r
   gAprioriGuid                                  ## SOMETIMES_CONSUMES   ## File\r
@@ -124,7 +125,6 @@
   gEventExitBootServicesFailedGuid              ## SOMETIMES_PRODUCES   ## Event\r
   gEfiVectorHandoffTableGuid                    ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEdkiiMemoryProfileGuid                       ## SOMETIMES_PRODUCES   ## GUID # Install protocol\r
-  gZeroGuid                                     ## SOMETIMES_CONSUMES   ## GUID\r
   gEfiPropertiesTableGuid                       ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiMemoryAttributesTableGuid                 ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiEndOfDxeEventGroupGuid                    ## SOMETIMES_CONSUMES   ## Event\r
@@ -160,6 +160,7 @@
   gEfiHiiPackageListProtocolGuid                ## SOMETIMES_PRODUCES\r
   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES\r
   gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES\r
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES\r
 \r
   # Arch Protocols\r
   gEfiBdsArchProtocolGuid                       ## CONSUMES\r
@@ -187,7 +188,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress         ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfileMemoryType                 ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfilePropertyMask               ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfileDriverPath                 ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy             ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask        ## CONSUMES\r
 \r
 # [Hob]\r
 # RESOURCE_DESCRIPTOR   ## CONSUMES\r