UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / CdExpressPei / CdExpressPei.inf

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index 4a44a5a9e3ccd94a3bb2b30eeb86bfb86699316e..691203816716d026d3fa99427b07c85d89b634bc 100644 (file)
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
@@ -1,20 +1,13 @@
 ## @file\r
 # PeiCdExpress recovery module.\r
 #\r
-# This module reads data from CDROM device by all installed block IO ppi and \r
+# This module reads data from CDROM device by all installed block IO ppi and\r
 # finds whether there is Recovery data in the device. If it finds recovery\r
 # data, it will install Device Recovery Module PPI.\r
 #\r
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions\r
-# of the BSD License which accompanies this distribution.  The\r
-# full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -31,7 +24,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
 #\r
 \r
 [Sources]\r
@@ -60,13 +53,16 @@
   ## NOTIFY\r
   ## CONSUMES\r
   gEfiPeiVirtualBlockIoPpiGuid\r
+  ## NOTIFY\r
+  ## CONSUMES\r
+  gEfiPeiVirtualBlockIo2PpiGuid\r
   gEfiPeiDeviceRecoveryModulePpiGuid            ## PRODUCES\r
 \r
-[FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport   ## CONSUMES\r
+[Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName         ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   CdExpressPeiExtra.uni\r