From: Yao, Jiewen <Jiewen.Yao@intel.com>
Date: Thu, 23 Apr 2015 08:53:39 +0000 (+0000)
Subject: IntelFspWrapperPkg update for FSP1.1
X-Git-Tag: edk2-stable201903~10017
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=88a539ca5f791000a1d033fbcf9c6c01ad9b9fe0

IntelFspWrapperPkg update for FSP1.1

-- Add BootLoaderTolumSize support
-- Fix LibraryClasses declaration in DEC file.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>
Reviewed-by: "Ma, Maurice" <maurice.ma@intel.com>
Reviewed-by: "Rangarajan, Ravi P" <ravi.p.rangarajan@intel.com>
Reviewed-by: "Mudusuru, Giri P" <giri.p.mudusuru@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17197 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c
index f6ffecb2ca..da7f8238d7 100644
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c
@@ -97,6 +97,7 @@ PeiFspInit (
   ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);
   ZeroMem (FspUpdRgn, UpdRegionSize);
   FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);
+  FspRtBuffer.BootLoaderTolumSize = 0;
 
   ZeroMem (&FspInitParams, sizeof(FspInitParams));
   FspInitParams.NvsBufferPtr = GetNvsBuffer ();
diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
index 7cad84effb..f11015e993 100644
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
@@ -164,6 +164,7 @@ PeiFspMemoryInit (
   ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);
   ZeroMem (FspUpdRgn, UpdRegionSize);
   FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);
+  FspRtBuffer.BootLoaderTolumSize = GetBootLoaderTolumSize ();
 
   ZeroMem (&FspMemoryInitParams, sizeof(FspMemoryInitParams));
   FspMemoryInitParams.NvsBufferPtr = GetNvsBuffer ();
diff --git a/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h b/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
index c997ea8b22..e5bb2c2125 100644
--- a/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
+++ b/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
@@ -68,6 +68,19 @@ UpdateFspUpdConfigs (
   IN OUT VOID        *FspUpdRgnPtr
   );
 
+/**
+  Get BootLoader Tolum size.
+
+  @note At this point, memory is NOT ready, PeiServices are available to use.
+
+  @return BootLoader Tolum size.
+**/
+UINT32
+EFIAPI
+GetBootLoaderTolumSize (
+  VOID
+  );
+
 /**
   Get TempRamExit parameter.
 
diff --git a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
index b7e81d3a92..bfed1cc97a 100644
--- a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
+++ b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
@@ -23,16 +23,16 @@
 
 [LibraryClasses]
   ##  @libraryclass  Provide FSP API related function.
-  FspApiLib|IntelFspWrapperPkg/Include/Library/FspApiLib.h
+  FspApiLib|Include/Library/FspApiLib.h
 
   ##  @libraryclass  Provide FSP hob process related function.
-  FspHobProcessLib|IntelFspWrapperPkg/Include/Library/FspHobProcessLib.h
+  FspHobProcessLib|Include/Library/FspHobProcessLib.h
 
   ##  @libraryclass  Provide FSP platform information related function.
-  FspPlatformInfoLib|IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
+  FspPlatformInfoLib|Include/Library/FspPlatformInfoLib.h
 
   ##  @libraryclass  Provide FSP wrapper platform sec related function.
-  FspPlatformSecLib|IntelFspWrapperPkg/Include/Library/FspPlatformSecLib.h
+  FspPlatformSecLib|Include/Library/FspPlatformSecLib.h
 
 [Guids]
   #
diff --git a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
index d21c5665d9..903e26eefa 100644
--- a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
+++ b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
@@ -82,6 +82,22 @@ UpdateFspUpdConfigs (
   return NULL;
 }
 
+/**
+  Get BootLoader Tolum size.
+
+  @note At this point, memory is NOT ready, PeiServices are available to use.
+
+  @return BootLoader Tolum size.
+**/
+UINT32
+EFIAPI
+GetBootLoaderTolumSize (
+  VOID
+  )
+{
+  return 0;
+}
+
 /**
   Get TempRamExit parameter.