MdeModulePkg/DxeCore: Add check to ensure no possible NULL ptr deref

[mirror_edk2.git] / MdeModulePkg / Core / DxeIplPeim / DxeIpl.inf

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 79f70d1a7c3c665e90bcafceb095d09e30194dc4..c54afe4aa6adbd64b4627562289ed937d8f255bd 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -5,7 +5,9 @@
 #  PPI to discover and dispatch the DXE Foundation and components that are\r
 #  needed to run the DXE Foundation.\r
 #\r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
+#\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
@@ -37,11 +39,12 @@
   DxeLoad.c\r
 \r
 [Sources.Ia32]\r
-  X64/VirtualMemory.h  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
-  X64/VirtualMemory.c  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
+  X64/VirtualMemory.h\r
+  X64/VirtualMemory.c\r
   Ia32/DxeLoadFunc.c\r
-  Ia32/IdtVectorAsm.asm||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
-  Ia32/IdtVectorAsm.S  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
+  Ia32/IdtVectorAsm.nasm\r
+  Ia32/IdtVectorAsm.asm\r
+  Ia32/IdtVectorAsm.S\r
 \r
 [Sources.X64]\r
   X64/VirtualMemory.h\r
@@ -80,7 +83,7 @@
   PeiServicesTablePointerLib\r
 \r
 [LibraryClasses.ARM, LibraryClasses.AARCH64]\r
-  ArmLib\r
+  ArmMmuLib\r
 \r
 [Ppis]\r
   gEfiDxeIplPpiGuid                 ## PRODUCES\r
@@ -110,7 +113,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress ## CONSUMES\r
 \r
 [Pcd.IA32,Pcd.X64]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable              ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable                      ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES\r
 \r
 [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack               ## SOMETIMES_CONSUMES\r