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 f6ffecb2cafef4e203e5f516c10332fc2ef97093..da7f8238d7590daa41e651745fdad45eb9d7efc7 100644 (file)
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV1.c
@@ -97,6 +97,7 @@ PeiFspInit (
   ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);\r
   ZeroMem (FspUpdRgn, UpdRegionSize);\r
   FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);\r
+  FspRtBuffer.BootLoaderTolumSize = 0;\r
 \r
   ZeroMem (&FspInitParams, sizeof(FspInitParams));\r
   FspInitParams.NvsBufferPtr = GetNvsBuffer ();\r

diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
index 7cad84effb75226a5e493c975da8c73ee54a6b1a..f11015e993f6c2a7a67647f8ba6f88d6c978eaee 100644 (file)
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
@@ -164,6 +164,7 @@ PeiFspMemoryInit (
   ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);\r
   ZeroMem (FspUpdRgn, UpdRegionSize);\r
   FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);\r
+  FspRtBuffer.BootLoaderTolumSize = GetBootLoaderTolumSize ();\r
 \r
   ZeroMem (&FspMemoryInitParams, sizeof(FspMemoryInitParams));\r
   FspMemoryInitParams.NvsBufferPtr = GetNvsBuffer ();\r

diff --git a/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h b/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
index c997ea8b220e5a7577599970bffc0497b0f70ceb..e5bb2c2125d35e6e899ce90d72bda2e367fd5e76 100644 (file)
--- a/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
+++ b/IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h
@@ -68,6 +68,19 @@ UpdateFspUpdConfigs (
   IN OUT VOID        *FspUpdRgnPtr\r
   );\r
 \r
+/**\r
+  Get BootLoader Tolum size.\r
+\r
+  @note At this point, memory is NOT ready, PeiServices are available to use.\r
+\r
+  @return BootLoader Tolum size.\r
+**/\r
+UINT32\r
+EFIAPI\r
+GetBootLoaderTolumSize (\r
+  VOID\r
+  );\r
+\r
 /**\r
   Get TempRamExit parameter.\r
 \r

diff --git a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
index b7e81d3a9266224614390b439de778895bd7c8c4..bfed1cc97aec8b9c67ccbbfbbb3453ba4983a895 100644 (file)
--- a/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
+++ b/IntelFspWrapperPkg/IntelFspWrapperPkg.dec
@@ -23,16 +23,16 @@
 \r
 [LibraryClasses]\r
   ##  @libraryclass  Provide FSP API related function.\r
-  FspApiLib|IntelFspWrapperPkg/Include/Library/FspApiLib.h\r
+  FspApiLib|Include/Library/FspApiLib.h\r
 \r
   ##  @libraryclass  Provide FSP hob process related function.\r
-  FspHobProcessLib|IntelFspWrapperPkg/Include/Library/FspHobProcessLib.h\r
+  FspHobProcessLib|Include/Library/FspHobProcessLib.h\r
 \r
   ##  @libraryclass  Provide FSP platform information related function.\r
-  FspPlatformInfoLib|IntelFspWrapperPkg/Include/Library/FspPlatformInfoLib.h\r
+  FspPlatformInfoLib|Include/Library/FspPlatformInfoLib.h\r
 \r
   ##  @libraryclass  Provide FSP wrapper platform sec related function.\r
-  FspPlatformSecLib|IntelFspWrapperPkg/Include/Library/FspPlatformSecLib.h\r
+  FspPlatformSecLib|Include/Library/FspPlatformSecLib.h\r
 \r
 [Guids]\r
   #\r

diff --git a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
index d21c5665d9e174116adcca8d8201a4411e46c525..903e26eefa91d83fdf9ade067774a26f807775be 100644 (file)
--- a/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
+++ b/IntelFspWrapperPkg/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
@@ -82,6 +82,22 @@ UpdateFspUpdConfigs (
   return NULL;\r
 }\r
 \r
+/**\r
+  Get BootLoader Tolum size.\r
+\r
+  @note At this point, memory is NOT ready, PeiServices are available to use.\r
+\r
+  @return BootLoader Tolum size.\r
+**/\r
+UINT32\r
+EFIAPI\r
+GetBootLoaderTolumSize (\r
+  VOID\r
+  )\r
+{\r
+  return 0;\r
+}\r
+\r
 /**\r
   Get TempRamExit parameter.\r
 \r