From cada0f30e6b6139e8906c6b699535c7d7db2e984 Mon Sep 17 00:00:00 2001
From: Liming Gao <liming.gao@intel.com>
Date: Mon, 25 Sep 2017 19:06:23 +0800
Subject: [PATCH] IntelFsp2WrapperPkg: Update Protocol/Guid usage in INF files

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
---
 .../FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf          | 6 +++---
 IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf  | 9 ++-------
 IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf  | 6 +++---
 .../PeiFspWrapperApiTestLib/PeiFspWrapperApiTestLib.inf  | 4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
index 54c2cbf679..ce3bfa0c75 100644
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
@@ -3,7 +3,7 @@
 #
 # This driver will register two callbacks to call fsp's notifies.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -53,10 +53,10 @@
 
 [Protocols]
   gEfiPciEnumerationCompleteProtocolGuid            ## CONSUMES
-  gAddPerfRecordProtocolGuid                        ## CONSUMES
+  gAddPerfRecordProtocolGuid                        ## SOMETIMES_CONSUMES
 
 [Guids]
-  gFspApiPerformanceGuid                            ## CONSUMES ## GUID
+  gFspApiPerformanceGuid                            ## SOMETIMES_CONSUMES ## GUID
   gEfiEventExitBootServicesGuid                     ## CONSUMES ## Event
   gFspHobGuid                                       ## CONSUMES ## HOB
 
diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
index 0901a1463b..2b3d240d08 100644
--- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
@@ -6,7 +6,7 @@
 # register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
 # notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -64,14 +64,9 @@
 [Sources]
   FspmWrapperPeim.c
 
-[Ppis]
-  gTopOfTemporaryRamPpiGuid             ## PRODUCES
-  gEfiEndOfPeiSignalPpiGuid             ## PRODUCES
-  gEfiPeiMemoryDiscoveredPpiGuid        ## PRODUCES
-
 [Guids]
   gFspHobGuid                           ## PRODUCES ## HOB
-  gFspApiPerformanceGuid                ## CONSUMES ## GUID
+  gFspApiPerformanceGuid                ## SOMETIMES_CONSUMES ## GUID
 
 [Depex]
   gEfiPeiMasterBootModePpiGuid
diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
index 261278f564..c858e7097d 100644
--- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
@@ -6,7 +6,7 @@
 # register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
 # notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -63,14 +63,14 @@
   gFspSiliconInitDonePpiGuid            ## PRODUCES
   gEfiEndOfPeiSignalPpiGuid             ## PRODUCES
   gEfiTemporaryRamDonePpiGuid           ## PRODUCES
-  gEfiPeiMemoryDiscoveredPpiGuid        ## PRODUCES
+  gEfiPeiMemoryDiscoveredPpiGuid        ## NOTIFY
 
 [Pcd]
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES
 
 [Guids]
   gFspHobGuid                           ## CONSUMES ## HOB
-  gFspApiPerformanceGuid                ## CONSUMES ## GUID
+  gFspApiPerformanceGuid                ## SOMETIMES_CONSUMES ## GUID
 
 [Sources]
   FspsWrapperPeim.c
diff --git a/IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/PeiFspWrapperApiTestLib.inf b/IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/PeiFspWrapperApiTestLib.inf
index fbbcf30035..4d2cbd850f 100644
--- a/IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/PeiFspWrapperApiTestLib.inf
+++ b/IntelFsp2WrapperPkg/Library/PeiFspWrapperApiTestLib/PeiFspWrapperApiTestLib.inf
@@ -1,7 +1,7 @@
 ### @file
 #  Provide FSP-M wrapper API test related function.
 #
-#  Copyright (C) 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (C) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -53,4 +53,4 @@
   HobLib
 
 [Guids]
-  gFspBootLoaderTolumHobGuid            ## CONSUMES ## GUID
\ No newline at end of file
+  gFspBootLoaderTolumHobGuid            ## SOMETIMES_CONSUMES ## GUID
\ No newline at end of file
-- 
2.39.2