3 files changed, 8 insertions, 1 deletions
diff --git a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
index f293dc8be8..b370a4ad56 100644
--- a/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
+++ b/IntelFspWrapperPkg/Library/PeiFspHobProcessLibSample/FspHobProcessLibSample.c
@@ -244,6 +244,8 @@ FspHobProcess (
       LowMemorySize
       );
 
+    S3PeiMemBase = 0;
+    S3PeiMemSize = 0;
     Status = GetS3MemoryInfo (&S3PeiMemBase, &S3PeiMemSize);
     ASSERT_EFI_ERROR (Status);
     DEBUG((DEBUG_INFO, "S3 memory %Xh - %Xh bytes\n", S3PeiMemBase, S3PeiMemSize));
diff --git a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
index 289d6638b0..e145b4eb02 100644
--- a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
+++ b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/Ia32/Fsp.h
@@ -12,6 +12,9 @@
 
 **/
 
+#ifndef __FSP_H__
+#define __FSP_H__
+
 //
 // Fv Header
 //
@@ -41,3 +44,5 @@
 //
 #define FSP_HEADER_IMAGEBASE_OFFSET     0x1C
 #define FSP_HEADER_TEMPRAMINIT_OFFSET   0x30
+
+#endif
diff --git a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
index 09b8036918..7df2abdeac 100644
--- a/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
+++ b/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
@@ -52,7 +52,7 @@
   Ia32/PeiCoreEntry.asm
   Ia32/AsmSaveSecContext.asm
   Ia32/Stack.asm
-
+  Ia32/Fsp.h
   Ia32/SecEntry.S
   Ia32/PeiCoreEntry.S
   Ia32/AsmSaveSecContext.S