Clean up code.

Contributed-under: TianoCore Contribution Agreement 1.0

Signed off by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed by: Eric Dong <eric.dong@intel.com>

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

diff --git a/IntelFspPkg/FspSecCore/SecMain.c b/IntelFspPkg/FspSecCore/SecMain.c
index 22706c8a8bc5493b13237be2499fe7f8eb5126f0..971a3a1b82ac12f0945deb205b91f6fcfe473cba 100644 (file)
--- a/IntelFspPkg/FspSecCore/SecMain.c
+++ b/IntelFspPkg/FspSecCore/SecMain.c
@@ -41,6 +41,7 @@ UINT64  mIdtEntryTemplate = 0xffff8e000008ffe4ULL;
   @param[in] SizeOfRam          Size of the temporary memory available for use.\r
   @param[in] TempRamBase        Base address of tempory ram\r
   @param[in] BootFirmwareVolume Base address of the Boot Firmware Volume.\r
+  @param[in] PeiCoreEntry       Pei Core entrypoint.\r
 \r
   @return This function never returns.\r
 \r
@@ -50,7 +51,8 @@ EFIAPI
 SecStartup (\r
   IN UINT32                   SizeOfRam,\r
   IN UINT32                   TempRamBase,\r
-  IN VOID                    *BootFirmwareVolume\r
+  IN VOID                    *BootFirmwareVolume,\r
+  IN UINTN                    PeiCoreEntry\r
   )\r
 {\r
   EFI_SEC_PEI_HAND_OFF        SecCoreData;\r
@@ -119,7 +121,7 @@ SecStartup (
   //\r
   // Call PeiCore Entry\r
   //\r
-  PeiCore = (PEI_CORE_ENTRY)(*(UINTN *)((&BootFirmwareVolume) + 1));\r
+  PeiCore = (PEI_CORE_ENTRY)(PeiCoreEntry);\r
   PeiCore (&SecCoreData, mPeiSecPlatformInformationPpi);\r
 \r
   //\r

diff --git a/IntelFspPkg/FspSecCore/SecMain.h b/IntelFspPkg/FspSecCore/SecMain.h
index 4dfbc850b35d2614c9c13fc6a7531b1402ee3afc..a9b48d12052a36ac4442ba93ff2c63b2a7efb203 100644 (file)
--- a/IntelFspPkg/FspSecCore/SecMain.h
+++ b/IntelFspPkg/FspSecCore/SecMain.h
@@ -107,6 +107,7 @@ InitializeFloatingPointUnits (
   @param[in] SizeOfRam          Size of the temporary memory available for use.\r
   @param[in] TempRamBase        Base address of tempory ram\r
   @param[in] BootFirmwareVolume Base address of the Boot Firmware Volume.\r
+  @param[in] PeiCoreEntry       Pei Core entrypoint.\r
 \r
   @return This function never returns.\r
 \r
@@ -116,7 +117,8 @@ EFIAPI
 SecStartup (\r
   IN UINT32                   SizeOfRam,\r
   IN UINT32                   TempRamBase,\r
-  IN VOID                    *BootFirmwareVolume\r
+  IN VOID                    *BootFirmwareVolume,\r
+  IN UINTN                    PeiCoreEntry\r
   );\r
 \r
 /**\r

diff --git a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
index f293dc8be8096c231ed8749ef073c36a5b1d32d0..b370a4ad5674a211784d483d1d6bf05175e8b2c0 100644 (file)
--- a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
+++ b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
@@ -244,6 +244,8 @@ FspHobProcess (
       LowMemorySize\r
       );\r
 \r
+    S3PeiMemBase = 0;\r
+    S3PeiMemSize = 0;\r
     Status = GetS3MemoryInfo (&S3PeiMemBase, &S3PeiMemSize);\r
     ASSERT_EFI_ERROR (Status);\r
     DEBUG((DEBUG_INFO, "S3 memory %Xh - %Xh bytes\n", S3PeiMemBase, S3PeiMemSize));\r

diff --git a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
index 289d6638b0f628e1351ec859605beaaf0f57d80d..e145b4eb02600c835405b7372410dd191f81e95d 100644 (file)
--- a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
+++ b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
@@ -12,6 +12,9 @@
 \r
 **/\r
 \r
+#ifndef __FSP_H__\r
+#define __FSP_H__\r
+\r
 //\r
 // Fv Header\r
 //\r
@@ -41,3 +44,5 @@
 //\r
 #define FSP_HEADER_IMAGEBASE_OFFSET     0x1C\r
 #define FSP_HEADER_TEMPRAMINIT_OFFSET   0x30\r
+\r
+#endif\r

diff --git a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
index 09b80369182135e22290ac8b7dc98edbcfcd2fbe..7df2abdeacac66b877c09602d13d39d5ef45f8ca 100644 (file)
--- a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
+++ b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
@@ -52,7 +52,7 @@
   Ia32/PeiCoreEntry.asm\r
   Ia32/AsmSaveSecContext.asm\r
   Ia32/Stack.asm\r
-\r
+  Ia32/Fsp.h\r
   Ia32/SecEntry.S\r
   Ia32/PeiCoreEntry.S\r
   Ia32/AsmSaveSecContext.S\r