reorg FspWrapperPlatformLib.

Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>

6 files changed, 8 insertions, 76 deletions

diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf
index 4ccc2fbd68..48c4433b01 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf
@@ -1,5 +1,5 @@
 ## @file

-#  Provide Dxe FSP wrapper platform reset related function.

+#  Provide Dxe FSP wrapper platform related function.

 #

 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>

 #

@@ -20,14 +20,12 @@
 ################################################################################

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = DxeFspWrapperPlatformResetLib

+  BASE_NAME                      = DxeFspWrapperPlatformLib

   FILE_GUID                      = C176048B-EF9C-4BE2-A464-26F00C551EAA

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = FspWrapperPlatformResetLib

   LIBRARY_CLASS                  = FspWrapperPlatformLib

 

-

 #

 # The following information is for reference only and not required by the build tools.

 #

@@ -43,7 +41,6 @@
 [Sources]

   DxeFspWrapperPlatformResetLib.c

 

-

 ################################################################################

 #

 # Package Dependency Section - list of Package files that are required for

diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
index 395f189ee9..395f189ee9 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformResetLib.c
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
index 17f42582c1..316c983322 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf
@@ -41,6 +41,7 @@
 

 [Sources]

   PeiFspWrapperPlatformLib.c

+  PeiFspWrapperPlatformResetLib.c

 

 ################################################################################

 #

@@ -59,3 +60,5 @@
 [LibraryClasses.IA32]

   FspPolicyInitLib

   FspPolicyUpdateLib

+  PeiServicesTablePointerLib

+  BaseMemoryLib

diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.c b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
index 501197c709..501197c709 100644
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.c
+++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformResetLib.c
diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.inf b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.inf
deleted file mode 100644
index 80df3427ff..0000000000
--- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.inf
+++ /dev/null
@@ -1,67 +0,0 @@
-## @file

-#  Provide FSP wrapper platform reset related function.

-#

-# Copyright (c) 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 which accompanies this distribution.

-# The full text of the license may be found at

-# http://opensource.org/licenses/bsd-license.php

-#

-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-##

-

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PeiFspWrapperPlatformResetLib

-  FILE_GUID                      = B1EB436F-9188-4A54-A28C-F019A64ED9EA

-  MODULE_TYPE                    = BASE

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = FspWrapperPlatformResetLib

-

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64

-#

-

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

-[Sources]

-  PeiFspWrapperPlatformResetLib.c

-

-

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MinPlatformPkg/MinPlatformPkg.dec

-  IntelFsp2Pkg/IntelFsp2Pkg.dec

-

-[LibraryClasses]

-  PeiServicesTablePointerLib

-  BaseMemoryLib

-

-[Ppis]

-

-

-[Guids]

-

-[Pcd]

diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
index 949cf159a4..b6a723616d 100644
--- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
+++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
@@ -90,7 +90,7 @@
   #

   # PEI phase common

   #

-  FspWrapperPlatformResetLib|MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.inf

+  FspWrapperPlatformLib|MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf

   TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf

   TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf

 

@@ -98,7 +98,7 @@
   #

   # DXE phase common

   #

-  FspWrapperPlatformLib|MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.inf

+  FspWrapperPlatformLib|MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf

   TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.inf

   TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib.inf

 

@@ -149,8 +149,7 @@
   MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobProcessLib/PeiFspWrapperHobProcessLib.inf

   MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf

   MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.inf

-  MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformResetLib/DxeFspWrapperPlatformResetLib.inf

-  MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatformResetLib/PeiFspWrapperPlatformResetLib.inf

+  MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatformLib/DxeFspWrapperPlatformLib.inf

   

   MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf